diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/egg/egg-editable-toolbar.c | 13 | ||||
| -rw-r--r-- | lib/egg/egg-toolbar-editor.c | 8 |
3 files changed, 23 insertions, 6 deletions
@@ -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); } |