[libegg] egg-editable-toolbar: use gtk_offscreen_window to draw widgets
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libegg] egg-editable-toolbar: use gtk_offscreen_window to draw widgets
- Date: Mon, 30 Aug 2010 19:38:07 +0000 (UTC)
commit 3cca5e513778f02bbf872b9e998dbafe23a6cb58
Author: Diego Escalante Urrelo <descalante igalia com>
Date: Mon Aug 30 13:59:59 2010 -0500
egg-editable-toolbar: use gtk_offscreen_window to draw widgets
Shuts up warnings when using the toolbar editor.
Bug #628361
libegg/toolbareditor/egg-editable-toolbar.c | 74 +++------------------------
1 files changed, 7 insertions(+), 67 deletions(-)
---
diff --git a/libegg/toolbareditor/egg-editable-toolbar.c b/libegg/toolbareditor/egg-editable-toolbar.c
index 60288c0..d302ccb 100644
--- a/libegg/toolbareditor/egg-editable-toolbar.c
+++ b/libegg/toolbareditor/egg-editable-toolbar.c
@@ -1740,27 +1740,6 @@ egg_editable_toolbar_set_fixed (EggEditableToolbar *etoolbar,
}
#define DEFAULT_ICON_HEIGHT 20
-#define DEFAULT_ICON_WIDTH 0
-
-static void
-fake_expose_widget (GtkWidget *widget,
- GdkPixmap *pixmap)
-{
- GdkWindow *tmp_window;
- GdkEventExpose event;
-
- event.type = GDK_EXPOSE;
- event.window = pixmap;
- event.send_event = FALSE;
- gtk_widget_get_allocation (widget, &event.area);
- event.region = NULL;
- event.count = 0;
-
- tmp_window = gtk_widget_get_window (widget);
- gtk_widget_set_window (widget, pixmap);
- gtk_widget_send_expose (widget, (GdkEvent *) &event);
- gtk_widget_set_window (widget, tmp_window);
-}
/* We should probably experiment some more with this.
* Right now the rendered icon is pretty good for most
@@ -1772,16 +1751,8 @@ new_pixbuf_from_widget (GtkWidget *widget)
{
GtkWidget *window;
GdkPixbuf *pixbuf;
- GtkRequisition requisition;
- GtkAllocation allocation;
- GdkPixmap *pixmap;
- GdkVisual *visual;
- gint icon_width;
gint icon_height;
GdkScreen *screen;
- GtkStyle *style;
-
- icon_width = DEFAULT_ICON_WIDTH;
screen = gtk_widget_get_screen (widget);
@@ -1793,47 +1764,16 @@ new_pixbuf_from_widget (GtkWidget *widget)
icon_height = DEFAULT_ICON_HEIGHT;
}
- window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ window = gtk_offscreen_window_new ();
+ /* Set the width to -1 as we want the separator to be as thin as possible. */
+ gtk_widget_set_size_request (widget, -1, icon_height);
gtk_container_add (GTK_CONTAINER (window), widget);
- gtk_widget_realize (window);
- gtk_widget_show (widget);
- gtk_widget_realize (widget);
- gtk_widget_map (widget);
-
- /* Gtk will never set the width or height of a window to 0. So setting the width to
- * 0 and than getting it will provide us with the minimum width needed to render
- * the icon correctly, without any additional window background noise.
- * This is needed mostly for pixmap based themes.
- */
- gtk_window_set_default_size (GTK_WINDOW (window), icon_width, icon_height);
- gtk_window_get_size (GTK_WINDOW (window),&icon_width, &icon_height);
-
- gtk_widget_size_request (window, &requisition);
- allocation.x = 0;
- allocation.y = 0;
- allocation.width = icon_width;
- allocation.height = icon_height;
- gtk_widget_size_allocate (window, &allocation);
- gtk_widget_size_request (window, &requisition);
-
- /* Create a pixmap */
- visual = gtk_widget_get_visual (window);
- pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_depth (visual));
- gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window));
-
- /* Draw the window */
- gtk_widget_ensure_style (window);
- style = gtk_widget_get_style (window);
- g_assert (style);
- g_assert (style->font_desc);
-
- fake_expose_widget (window, pixmap);
- fake_expose_widget (widget, pixmap);
-
- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, icon_width, icon_height);
- gdk_pixbuf_get_from_drawable (pixbuf, pixmap, NULL, 0, 0, 0, 0, icon_width, icon_height);
+ gtk_widget_show_all (window);
+ /* Process the waiting events to have the widget actually drawn */
+ gdk_window_process_updates (gtk_widget_get_window (window), TRUE);
+ pixbuf = gtk_offscreen_window_get_pixbuf (GTK_OFFSCREEN_WINDOW (window));
gtk_widget_destroy (window);
return pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]