mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WTree: remove WTree:active. Use WST_FOCUSED instead. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-06-13 10:24:49 +03:00
parent e1a2e8f8ec
commit ac35ab0401
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/filemanager/tree.c
View File

@ -99,7 +99,6 @@ struct WTree
char search_buffer[MC_MAXFILENAMELEN]; /* Current search string */
tree_entry **tree_shown; /* Entries currently on screen */
int is_panel; /* panel or plain widget flag */
int active; /* if it's currently selected */
int searching; /* Are we on searching mode? */
int topdiff; /* The difference between the topmost
shown and the selected */
@ -348,7 +347,7 @@ show_tree (WTree * tree)
continue;
if (tree->is_panel)
tty_setcolor (tree->active && current == tree->selected_ptr
tty_setcolor (widget_get_state (w, WST_FOCUSED) && current == tree->selected_ptr
? SELECTED_COLOR : NORMAL_COLOR);
else
tty_setcolor (current == tree->selected_ptr ? TREE_CURRENTC (h) : TREE_NORMALC (h));
@ -1156,7 +1155,6 @@ tree_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
return MSG_HANDLED;
case MSG_FOCUS:
tree->active = 1;
buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), tree_map, w);
buttonbar_set_label (b, 2, Q_ ("ButtonBar|Rescan"), tree_map, w);
buttonbar_set_label (b, 3, Q_ ("ButtonBar|Forget"), tree_map, w);
@ -1182,7 +1180,6 @@ tree_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *da
selected item */
case MSG_UNFOCUS:
tree->active = 0;
tree->searching = 0;
show_tree (tree);
return MSG_HANDLED;
@ -1227,7 +1224,7 @@ tree_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event)
/* return MOU_UNHANDLED */
event->result.abort = TRUE;
}
else if (!tree->active)
else if (!widget_get_state (w, WST_FOCUSED))
change_panel ();
break;
@ -1294,7 +1291,6 @@ tree_new (int y, int x, int lines, int cols, gboolean is_panel)
tree->search_buffer[0] = 0;
tree->topdiff = w->lines / 2;
tree->searching = 0;
tree->active = 0;
load_tree (tree);
return tree;