summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2009-02-28 06:13:58 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2009-02-28 06:13:58 +0000
commitd65c585c284b1511b0922fcc801ec32852b965ef (patch)
tree003af0dc26fd698c006a850ccecd75306cd12a46
parent544899759b777311d375a6aaca28fb1528380dd5 (diff)
downloadgdk-pixbuf-d65c585c284b1511b0922fcc801ec32852b965ef.tar.gz
Keep popups on the right screen. Pointed out by Morten Welinder
* gtk/gtkentrycompletion.c: * gtk/gtknotebook.c: Keep popups on the right screen. Pointed out by Morten Welinder svn path=/trunk/; revision=22423
-rw-r--r--ChangeLog8
-rw-r--r--gtk/gtkentrycompletion.c4
-rw-r--r--gtk/gtknotebook.c2
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a89dc4802..58c687ddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-02-28 Matthias Clasen <mclasen@redhat.com>
+ Bug 573211 – Setting screen for popup windows
+
+ * gtk/gtkentrycompletion.c:
+ * gtk/gtknotebook.c: Keep popups on the right screen.
+ Pointed out by Morten Welinder
+
+2009-02-28 Matthias Clasen <mclasen@redhat.com>
+
Bug 573113 – Can't build tests due to testfilechooserbutton.c...
* tests/testfilechooserbutton.c: Don't use deprecated API.
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index e0fdeca7a..820449dc1 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1510,7 +1510,9 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->tree_view)));
gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (GTK_TREE_VIEW (completion->priv->action_view)));
-
+
+ gtk_window_set_screen (GTK_WINDOW (completion->priv->popup_window),
+ gtk_widget_get_screen (completion->priv->entry));
gtk_widget_show (completion->priv->popup_window);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index b81c01cdb..9b1c0c3cb 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -3218,6 +3218,8 @@ gtk_notebook_drag_begin (GtkWidget *widget,
gtk_widget_unparent (tab_label);
priv->dnd_window = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_window_set_screen (GTK_WINDOW (priv->dnd_window),
+ gtk_widget_get_screen (widget));
gtk_container_add (GTK_CONTAINER (priv->dnd_window), tab_label);
gtk_widget_set_size_request (priv->dnd_window,
priv->detached_tab->allocation.width,