Ensure ctrl modifier is handled, by dealing with it before no-modifiers case.
This commit is contained in:
parent
5aa5eb9d6f
commit
fd961c6dfa
|
@ -2431,6 +2431,12 @@ static nserror treeview_node_mouse_action_cb(treeview_node *node, void *ctx,
|
||||||
/* Tell client an entry was launched */
|
/* Tell client an entry was launched */
|
||||||
ma->tree->callbacks->entry(msg, node->client_data);
|
ma->tree->callbacks->entry(msg, node->client_data);
|
||||||
|
|
||||||
|
} else if (ma->mouse & BROWSER_MOUSE_PRESS_2 ||
|
||||||
|
(ma->mouse & BROWSER_MOUSE_PRESS_1 &&
|
||||||
|
ma->mouse & BROWSER_MOUSE_MOD_2)) {
|
||||||
|
/* Toggle selection of node */
|
||||||
|
action |= TV_NODE_ACTION_SELECTION;
|
||||||
|
|
||||||
} else if (ma->mouse & BROWSER_MOUSE_PRESS_1 &&
|
} else if (ma->mouse & BROWSER_MOUSE_PRESS_1 &&
|
||||||
!(node->flags & TREE_NODE_SELECTED) &&
|
!(node->flags & TREE_NODE_SELECTED) &&
|
||||||
part != TV_NODE_PART_TOGGLE) {
|
part != TV_NODE_PART_TOGGLE) {
|
||||||
|
@ -2440,11 +2446,6 @@ static nserror treeview_node_mouse_action_cb(treeview_node *node, void *ctx,
|
||||||
/* Select node */
|
/* Select node */
|
||||||
action |= TV_NODE_ACTION_SELECTION;
|
action |= TV_NODE_ACTION_SELECTION;
|
||||||
|
|
||||||
} else if (ma->mouse & BROWSER_MOUSE_PRESS_2 ||
|
|
||||||
(ma->mouse & BROWSER_MOUSE_PRESS_1 &&
|
|
||||||
ma->mouse & BROWSER_MOUSE_MOD_2)) {
|
|
||||||
/* Toggle selection of node */
|
|
||||||
action |= TV_NODE_ACTION_SELECTION;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (action & TV_NODE_ACTION_SELECTION) {
|
if (action & TV_NODE_ACTION_SELECTION) {
|
||||||
|
|
Loading…
Reference in New Issue