aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Garcia Campos <carlosgc@gnome.org>2007-08-16 16:15:30 +0800
committerCarlos Garcia Campos <carlosgc@src.gnome.org>2007-08-16 16:15:30 +0800
commitbfff564b9f7e666de0ce9acce66f351ed21d9810 (patch)
tree1bf3469ed9fabbc07a707f60acc14f34badfba15
parent30c6a6045363b1031307db565bcd20b7074afd4b (diff)
downloadgsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar.gz
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar.bz2
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar.lz
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar.xz
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.tar.zst
gsoc2013-epiphany-bfff564b9f7e666de0ce9acce66f351ed21d9810.zip
Fix multihead problems in toolbar editor.
2007-08-16 Carlos Garcia Campos <carlosgc@gnome.org> * lib/egg/egg-toolbar-editor.c: (set_drag_cursor): * lib/egg/egg-editable-toolbar.c: (configure_item_cursor), (new_pixbuf_from_widget): Fix multihead problems in toolbar editor. svn path=/trunk/; revision=7279
-rw-r--r--ChangeLog8
-rw-r--r--lib/egg/egg-editable-toolbar.c13
-rw-r--r--lib/egg/egg-toolbar-editor.c8
3 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dc919964..3a0a50ed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-16 Carlos Garcia Campos <carlosgc@gnome.org>
+
+ * lib/egg/egg-toolbar-editor.c: (set_drag_cursor):
+ * lib/egg/egg-editable-toolbar.c: (configure_item_cursor),
+ (new_pixbuf_from_widget):
+
+ Fix multihead problems in toolbar editor.
+
2007-08-15 Diego Escalante Urrelo <diegoe@gnome.org>
* embed/downloader-view.c:
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 86ae386ce..d65b7eb97 100644
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -434,9 +434,13 @@ configure_item_cursor (GtkToolItem *item,
if (priv->edit_mode > 0)
{
GdkCursor *cursor;
+ GdkScreen *screen;
GdkPixbuf *pixbuf = NULL;
-
- cursor = gdk_cursor_new (GDK_HAND2);
+
+ screen = gtk_widget_get_screen (GTK_WIDGET (etoolbar));
+
+ cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
+ GDK_HAND2);
gdk_window_set_cursor (widget->window, cursor);
gdk_cursor_unref (cursor);
@@ -1763,10 +1767,13 @@ new_pixbuf_from_widget (GtkWidget *widget)
GdkVisual *visual;
gint icon_width;
gint icon_height;
+ GdkScreen *screen;
icon_width = DEFAULT_ICON_WIDTH;
- if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_default (),
+ screen = gtk_widget_get_screen (widget);
+
+ if (!gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
GTK_ICON_SIZE_LARGE_TOOLBAR,
NULL,
&icon_height))
diff --git a/lib/egg/egg-toolbar-editor.c b/lib/egg/egg-toolbar-editor.c
index 07674d470..8671cd4c3 100644
--- a/lib/egg/egg-toolbar-editor.c
+++ b/lib/egg/egg-toolbar-editor.c
@@ -312,10 +312,12 @@ static void
set_drag_cursor (GtkWidget *widget)
{
GdkCursor *cursor;
+ GdkScreen *screen;
- /* FIXME multihead */
- cursor = gdk_cursor_new (GDK_HAND2);
-
+ screen = gtk_widget_get_screen (widget);
+
+ cursor = gdk_cursor_new_for_display (gdk_screen_get_display (screen),
+ GDK_HAND2);
gdk_window_set_cursor (widget->window, cursor);
gdk_cursor_unref (cursor);
}