AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 659406 - Abstract what triggers a context menu

Browse Source 
Add _gtk_button_event_triggers_context_menu() and use it instead
of checking for event->button == 3, so context menus are invoked
correctly on the Mac.
This commit is contained in:
Michael Natterer 2011-09-19 00:32:52 +02:00 committed by Michael Natterer
parent 2666c0e71f
commit 7be2ea823d
13 changed files with 67 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkcolorsel.c
View File

@ -1436,9 +1436,8 @@ palette_press (GtkWidget *drawing_area,
GtkColorSelection *colorsel = GTK_COLOR_SELECTION (data);
gtk_widget_grab_focus (drawing_area);
if (event->button == 3 &&
event->type == GDK_BUTTON_PRESS)
if (_gtk_button_event_triggers_context_menu (event))
{
do_popup (colorsel, drawing_area, event->time);
return TRUE;

18
gtk/gtkentry.c
View File

@ -3688,8 +3688,15 @@ gtk_entry_button_press (GtkWidget *widget,
}
tmp_pos = gtk_entry_find_position (entry, event->x + entry->scroll_offset);
if (event->button == 1)
if (_gtk_button_event_triggers_context_menu (event))
{
gtk_entry_do_popup (entry, event);
entry->button = 0; /* Don't wait for release, since the menu will gtk_grab_add */
return TRUE;
}
else if (event->button == 1)
{
gboolean have_selection = gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end);
@ -3810,13 +3817,6 @@ gtk_entry_button_press (GtkWidget *widget,
gtk_widget_error_bell (widget);
}
}
else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
{
gtk_entry_do_popup (entry, event);
entry->button = 0; /* Don't wait for release, since the menu will gtk_grab_add */
return TRUE;
}
return FALSE;
}

4
gtk/gtkfilechooserdefault.c
View File

@ -3419,7 +3419,7 @@ shortcuts_button_press_event_cb (GtkWidget *widget,
if (in_press)
return FALSE;
if (event->button != 3)
if (!_gtk_button_event_triggers_context_menu (event))
return FALSE;
in_press = TRUE;
@ -4097,7 +4097,7 @@ list_button_press_event_cb (GtkWidget *widget,
if (in_press)
return FALSE;
if (event->button != 3)
if (!_gtk_button_event_triggers_context_menu (event))
return FALSE;
in_press = TRUE;

25
gtk/gtklabel.c
View File

@ -4189,17 +4189,17 @@ gtk_label_button_press (GtkWidget *widget,
if (info->active_link)
{
if (event->button == 1)
{
info->link_clicked = 1;
gtk_widget_queue_draw (widget);
}
else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
if (_gtk_button_event_triggers_context_menu (event))
{
info->link_clicked = 1;
gtk_label_do_popup (label, event);
return TRUE;
}
else if (event->button == 1)
{
info->link_clicked = 1;
gtk_widget_queue_draw (widget);
}
}
if (!info->selectable)
@ -4208,7 +4208,13 @@ gtk_label_button_press (GtkWidget *widget,
info->in_drag = FALSE;
info->select_words = FALSE;
if (event->button == 1)
if (_gtk_button_event_triggers_context_menu (event))
{
gtk_label_do_popup (label, event);
return TRUE;
}
else if (event->button == 1)
{
if (!gtk_widget_has_focus (widget))
{
@ -4271,12 +4277,7 @@ gtk_label_button_press (GtkWidget *widget,
return TRUE;
}
else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
{
gtk_label_do_popup (label, event);
return TRUE;
}
return FALSE;
}

2
gtk/gtklinkbutton.c
View File

@ -455,7 +455,7 @@ gtk_link_button_button_press (GtkWidget *widget,
if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
if ((event->button == 3) && (event->type == GDK_BUTTON_PRESS))
if (_gtk_button_event_triggers_context_menu (event))
{
gtk_link_button_do_popup (GTK_LINK_BUTTON (widget), event);

21
gtk/gtkmain.c
View File

@ -2632,5 +2632,26 @@ _gtk_boolean_handled_accumulator (GSignalInvocationHint *ihint,
return continue_emission;
}
gboolean
_gtk_button_event_triggers_context_menu (GdkEventButton *event)
{
if (event->type == GDK_BUTTON_PRESS)
{
if (event->button == 3 &&
! (event->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK)))
return TRUE;
#ifdef GDK_WINDOWING_QUARTZ
if (event->button == 1 &&
! (event->state & (GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) &&
(event->state & GDK_CONTROL_MASK))
return TRUE;
#endif
}
return FALSE;
}
#define __GTK_MAIN_C__
#include "gtkaliasdef.c"

3
gtk/gtkmountoperation.c
View File

@ -1171,8 +1171,7 @@ on_button_press_event_for_process_tree_view (GtkWidget *widget,
ret = FALSE;
/* Ignore double-clicks and triple-clicks */
if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
if (_gtk_button_event_triggers_context_menu (event))
{
ret = do_popup_menu_for_process_tree_view (widget, event, op);
}

2
gtk/gtknotebook.c
View File

@ -2681,7 +2681,7 @@ gtk_notebook_button_press (GtkWidget *widget,
if (arrow)
return gtk_notebook_arrow_button_press (notebook, arrow, event->button);
if (event->button == 3 && notebook->menu)
if (notebook->menu && _gtk_button_event_triggers_context_menu (event))
{
gtk_menu_popup (GTK_MENU (notebook->menu), NULL, NULL,
NULL, NULL, 3, event->time);

2
gtk/gtkprivate.h
View File

@ -130,6 +130,8 @@ gboolean _gtk_fnmatch (const char *pattern,
#define GTK_MODIFY_SELECTION_MOD_MASK GDK_MOD2_MASK
#endif
gboolean _gtk_button_event_triggers_context_menu (GdkEventButton *event);
G_END_DECLS
#endif /* __GTK_PRIVATE_H__ */

4
gtk/gtkrecentchooserdefault.c
View File

@ -1893,8 +1893,8 @@ recent_view_button_press_cb (GtkWidget *widget,
gpointer user_data)
{
GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (user_data);
if (event->button == 3)
if (_gtk_button_event_triggers_context_menu (event))
{
GtkTreePath *path;
gboolean res;

12
gtk/gtkstatusicon.c
View File

@ -1750,16 +1750,16 @@ gtk_status_icon_button_press (GtkStatusIcon *status_icon,
if (handled)
return TRUE;
if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{
emit_activate_signal (status_icon);
return TRUE;
}
else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
if (_gtk_button_event_triggers_context_menu (event))
{
emit_popup_menu_signal (status_icon, event->button, event->time);
return TRUE;
}
else if (event->button == 1 && event->type == GDK_BUTTON_PRESS)
{
emit_activate_signal (status_icon);
return TRUE;
}
return FALSE;
}

12
gtk/gtktextview.c
View File

@ -4352,7 +4352,12 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
{
gtk_text_view_reset_im_context (text_view);
if (event->button == 1)
if (_gtk_button_event_triggers_context_menu (event))
{
gtk_text_view_do_popup (text_view, event);
return TRUE;
}
else if (event->button == 1)
{
/* If we're in the selection, start a drag copy/move of the
* selection; otherwise, start creating a new selection.
@ -4402,11 +4407,6 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
text_view->editable);
return TRUE;
}
else if (event->button == 3)
{
gtk_text_view_do_popup (text_view, event);
return TRUE;
}
}
else if ((event->type == GDK_2BUTTON_PRESS ||
event->type == GDK_3BUTTON_PRESS) &&

2
gtk/gtktoolbar.c
View File

@ -2699,7 +2699,7 @@ static gboolean
gtk_toolbar_button_press (GtkWidget *toolbar,
GdkEventButton *event)
{
if (event->button == 3)
if (_gtk_button_event_triggers_context_menu (event))
{
gboolean return_value;