From fdb745c1c9f97a2f60c84397e6e160912eec0430 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sun, 16 Oct 2005 18:59:45 +0000 Subject: Exten the EphyLinkAction to attach a mouse-release-event handler which 2005-10-16 Philip Langdale * src/ephy-link-action.c: (proxy_button_release_event_cb), (get_event_widget), (ephy_link_action_connect_proxy), (ephy_link_action_disconnect_proxy), (ephy_link_action_class_init), (ephy_link_action_get_type): Exten the EphyLinkAction to attach a mouse-release-event handler which turns around and calls gtk_action_activate in response to a middle-click even on the proxy. This allows us to fully encapsulate the extra work needed to catch middle clicks. The GoHome action will automatically start working correctly now that it is getting activated in this case. * src/ephy-navigation-action.c: (activate_by_history_index), (activate_back_or_forward_menu_item_cb), (ephy_navigation_action_activate), (ephy_navigation_action_class_init): Fully enscapsulate 'activate' handling inside the action. This is more consistent because the menus are already handled internally. Also add support for middle-click on back/forward/up. * src/ephy-toolbar.c: (ephy_toolbar_set_window): Don't attach 'activate' signal handlers to the navigate actions because activation is now handled internally to the action. I intend to make a followup change that removes the separate actions for GoUp/Back/Forward in the menu and replace them with the main actions already used in the toolbar. This means the menu items will get middle-click support for free. * lib/ephy-gui.c: (ephy_gui_is_middle_click): Only consider an unmodified middle-click to be a middle-click. --- lib/ephy-gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c index 2e591c5e7..28dee83f3 100644 --- a/lib/ephy-gui.c +++ b/lib/ephy-gui.c @@ -434,7 +434,7 @@ ephy_gui_is_middle_click (void) /* middle-click or control-click */ if ((button == 1 && ((state & modifiers) == GDK_CONTROL_MASK)) || - (button == 2)) + (button == 2 && ((state & modifiers) == 0))) { is_middle_click = TRUE; } -- cgit v1.2.3