Fix flickering on resizing

[evince.git] / shell / ev-sidebar-links.c

diff --git a/shell/ev-sidebar-links.c b/shell/ev-sidebar-links.c
index 93959b37ab60444963ff94fd7520b7aabb50b7a3..fdd484416d02e507ad8e0be6b48a4f2debef2c32 100644 (file)
--- a/shell/ev-sidebar-links.c
+++ b/shell/ev-sidebar-links.c
@@ -33,6 +33,7 @@
 #include "ev-job-queue.h"
 #include "ev-document-links.h"
 #include "ev-window.h"
+#include "ev-gui.h"
 
 struct _EvSidebarLinksPrivate {
        GtkWidget *tree_view;
@@ -259,6 +260,35 @@ print_section_cb (GtkWidget *menuitem, EvSidebarLinks *sidebar)
        }
 }
 
+static GtkMenu *
+build_popup_menu (EvSidebarLinks *sidebar)
+{
+       GtkWidget *menu;
+       GtkWidget *item;
+
+       menu = gtk_menu_new ();
+       item = gtk_image_menu_item_new_from_stock (GTK_STOCK_PRINT, NULL);
+       gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child), _("Print..."));
+       gtk_widget_show (item);
+       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+       g_signal_connect (item, "activate",
+                         G_CALLBACK (print_section_cb), sidebar);
+
+       return GTK_MENU (menu);
+}
+
+static void
+popup_menu_cb (GtkWidget *treeview, EvSidebarLinks *sidebar)
+{
+       GtkMenu *menu = build_popup_menu (sidebar);
+
+       gtk_menu_popup (menu, NULL, NULL,
+                       ev_gui_menu_position_tree_selection,
+                       sidebar->priv->tree_view, 0,
+                       gtk_get_current_event_time ());
+       gtk_menu_shell_select_first (GTK_MENU_SHELL (menu), FALSE);
+}
+
 static gboolean
 button_press_cb (GtkWidget *treeview,
                  GdkEventButton *event,
@@ -272,25 +302,11 @@ button_press_cb (GtkWidget *treeview,
                                                   event->y,
                                                   &path,
                                                   NULL, NULL, NULL)) {
-                       GtkWidget *menu;
-                       GtkWidget *item;
-
                        gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview),
                                                  path, NULL, FALSE);
-
-                       menu = gtk_menu_new ();
-                       item = gtk_image_menu_item_new_from_stock
-                                                       (GTK_STOCK_PRINT, NULL);
-                       gtk_label_set_label (GTK_LABEL (GTK_BIN (item)->child),
-                                            _("Print..."));
-                       gtk_widget_show (item);
-                       gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-                       g_signal_connect (item, "activate",
-                                         G_CALLBACK (print_section_cb), sidebar);
-
-                       gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 2,
+                       gtk_menu_popup (build_popup_menu (sidebar), NULL,
+                                       NULL, NULL, NULL, event->button,
                                        gtk_get_current_event_time ());
-
                        gtk_tree_path_free (path);
 
                        return TRUE;
@@ -357,6 +373,10 @@ ev_sidebar_links_construct (EvSidebarLinks *ev_sidebar_links)
                          "button_press_event",
                          G_CALLBACK (button_press_cb),
                          ev_sidebar_links);
+       g_signal_connect (GTK_TREE_VIEW (priv->tree_view),
+                         "popup_menu",
+                         G_CALLBACK (popup_menu_cb),
+                         ev_sidebar_links);
 }
 
 static void