aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@mail.utexas.edu>2005-10-17 02:59:45 +0800
committerPhilip Langdale <philipl@src.gnome.org>2005-10-17 02:59:45 +0800
commitfdb745c1c9f97a2f60c84397e6e160912eec0430 (patch)
tree534ae50d00bb452c247a9805ff5da9b7a3909cba /lib
parent803df66ce8311b4630402a5c6efad3922af8dd6b (diff)
downloadgsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar.gz
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar.bz2
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar.lz
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar.xz
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.tar.zst
gsoc2013-epiphany-fdb745c1c9f97a2f60c84397e6e160912eec0430.zip
Exten the EphyLinkAction to attach a mouse-release-event handler which
2005-10-16 Philip Langdale <philipl@mail.utexas.edu> * 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.
Diffstat (limited to 'lib')
-rw-r--r--lib/ephy-gui.c2
1 files changed, 1 insertions, 1 deletions
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;
}