mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-03 18:14:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Menu: avoid double draw on resize.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2016-06-13 11:30:57 +03:00
parent 91c72122a8
commit fd7c6c1c5d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/widget/menu.c
View File

@ -573,21 +573,20 @@ menubar_handle_key (WMenuBar * menubar, int key)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
static cb_ret_t static gboolean
menubar_refresh (WMenuBar * menubar) menubar_refresh (WMenuBar * menubar)
{ {
Widget *w = WIDGET (menubar); Widget *w = WIDGET (menubar);
if (!menubar->is_active) if (!menubar->is_active)
return MSG_NOT_HANDLED; return FALSE;
/* Trick to get all the mouse events */ /* Trick to get all the mouse events */
w->lines = LINES; w->lines = LINES;
/* Trick to get all of the hotkeys */ /* Trick to get all of the hotkeys */
widget_want_hotkey (w, TRUE); widget_want_hotkey (w, TRUE);
menubar_draw (menubar); return TRUE;
return MSG_HANDLED;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -601,7 +600,12 @@ menubar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
{ {
/* We do not want the focus unless we have been activated */ /* We do not want the focus unless we have been activated */
case MSG_FOCUS: case MSG_FOCUS:
return menubar_refresh (menubar); if (menubar_refresh (menubar))
{
menubar_draw (menubar);
return MSG_HANDLED;
}
return MSG_NOT_HANDLED;
case MSG_UNFOCUS: case MSG_UNFOCUS:
return menubar->is_active ? MSG_NOT_HANDLED : MSG_HANDLED; return menubar->is_active ? MSG_NOT_HANDLED : MSG_HANDLED;
@ -621,10 +625,8 @@ menubar_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void
return MSG_NOT_HANDLED; return MSG_NOT_HANDLED;
case MSG_DRAW: case MSG_DRAW:
if (menubar->is_visible) if (menubar->is_visible || menubar_refresh (menubar))
menubar_draw (menubar); menubar_draw (menubar);
else
menubar_refresh (menubar);
return MSG_HANDLED; return MSG_HANDLED;
case MSG_RESIZE: case MSG_RESIZE: