mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-13 19:33:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1643_mouse_hidden_menu'

Browse Source 
* 1643_mouse_hidden_menu:
  Ticket #1643: menu events handling in file panel in case of invisible menu.
This commit is contained in:
Andrew Borodin 2009-09-30 08:46:10 +04:00
commit d72b1deeca
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/screen.c
View File

@ -2558,13 +2558,6 @@ do_panel_event (Gpm_Event *event, WPanel *panel, int *redir)
const gboolean is_active = dlg_widget_active (panel);
const gboolean mouse_down = (event->type & GPM_DOWN) != 0;
/* rest of the upper frame, the menu is invisible - call menu */
if (mouse_down && event->y == 1 && !menubar_visible) {
*redir = 1;
event->x += panel->widget.x;
return (*(the_menubar->widget.mouse)) (event, the_menubar);
}
/* "<" button */
if (mouse_down && event->y == 1 && event->x == 2) {
directory_history_prev (panel);
@ -2583,6 +2576,13 @@ do_panel_event (Gpm_Event *event, WPanel *panel, int *redir)
return MOU_NORMAL;
}
/* rest of the upper frame, the menu is invisible - call menu */
if (mouse_down && event->y == 1 && !menubar_visible) {
*redir = 1;
event->x += panel->widget.x;
return the_menubar->widget.mouse (event, the_menubar);
}
/* Mouse wheel events */
if (mouse_down && (event->buttons & GPM_B_UP)) {
if (is_active) {
@ -2593,6 +2593,7 @@ do_panel_event (Gpm_Event *event, WPanel *panel, int *redir)
}
return MOU_NORMAL;
}
if (mouse_down && (event->buttons & GPM_B_DOWN)) {
if (is_active) {
if (panel->top_file + ITEMS (panel) < panel->count)