zoom-control: don't use eel_pop_up_context_menu function

raveit65 · raveit65 · commit 42e5c91bee1d · 2018-05-10T21:42:28.000+02:00
in favor of constant using of gtk_menu_popup_at_widget

for mouse and keyboard events.
diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c
@@ -124,12 +124,16 @@ zoom_button_clicked (GtkButton *button, CajaZoomControl *zoom_control)
 }
 
 static void
-zoom_popup_menu_show (GdkEventButton *event, CajaZoomControl *zoom_control)
+zoom_popup_menu_show (GtkWidget *widget, GdkEventButton *event, CajaZoomControl *zoom_control)
 {
-    eel_pop_up_context_menu (create_zoom_menu (zoom_control),
-                             EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
-                             EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,
-                             event);
+    GtkMenu *menu;
+
+    menu = create_zoom_menu (zoom_control);
+    gtk_menu_popup_at_widget (menu,
+                              widget,
+                              GDK_GRAVITY_SOUTH_WEST,
+                              GDK_GRAVITY_NORTH_WEST,
+                              (const GdkEvent*) event);
 }
 
 static void
@@ -162,7 +166,7 @@ caja_zoom_control_button_press_event (GtkWidget *widget,
     /* check for the context menu button and show the menu */
     if (event->button == CONTEXTUAL_MENU_BUTTON)
     {
-        zoom_popup_menu_show (event, zoom_control);
+        zoom_popup_menu_show (widget, event, zoom_control);
         return TRUE;
     }
     /* We don't change our state (to reflect the new zoom) here.

Original file line number	Diff line number	Diff line change
`@@ -124,12 +124,16 @@ zoom_button_clicked (GtkButton button, CajaZoomControl zoom_control)`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`static void`
`127`		`-zoom_popup_menu_show (GdkEventButton event, CajaZoomControl zoom_control)`
	`127`	`+zoom_popup_menu_show (GtkWidget widget, GdkEventButton event, CajaZoomControl *zoom_control)`
`128`	`128`	`{`
`129`		`- eel_pop_up_context_menu (create_zoom_menu (zoom_control),`
`130`		`- EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,`
`131`		`- EEL_DEFAULT_POPUP_MENU_DISPLACEMENT,`
`132`		`- event);`
	`129`	`+ GtkMenu *menu;`
	`130`	`+`
	`131`	`+ menu = create_zoom_menu (zoom_control);`
	`132`	`+ gtk_menu_popup_at_widget (menu,`
	`133`	`+ widget,`
	`134`	`+ GDK_GRAVITY_SOUTH_WEST,`
	`135`	`+ GDK_GRAVITY_NORTH_WEST,`
	`136`	`+ (const GdkEvent*) event);`
`133`	`137`	`}`
`134`	`138`
`135`	`139`	`static void`
`@@ -162,7 +166,7 @@ caja_zoom_control_button_press_event (GtkWidget *widget,`
`162`	`166`	`/* check for the context menu button and show the menu */`
`163`	`167`	`if (event->button == CONTEXTUAL_MENU_BUTTON)`
`164`	`168`	`{`
`165`		`- zoom_popup_menu_show (event, zoom_control);`
	`169`	`+ zoom_popup_menu_show (widget, event, zoom_control);`
`166`	`170`	`return TRUE;`
`167`	`171`	`}`
`168`	`172`	`/* We don't change our state (to reflect the new zoom) here.`