diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-02-08 23:14:54 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-02-09 09:49:28 +0100 |
| commit | ed4ebdb93f3256ba758c0f26ab9fdbea151d162c (patch) | |
| tree | 5c1b3f3b1c1ca2f24dec4513629f5aad46780e66 | |
| parent | 8755736f8c83df00f20037a8db1d63662f37c1ac (diff) | |
| download | mate-panel-ed4ebdb93f3256ba758c0f26ab9fdbea151d162c.tar.bz2 mate-panel-ed4ebdb93f3256ba758c0f26ab9fdbea151d162c.tar.xz | |
Fix ButtonWidget appearing as a thin line on creation
It makes no sense to use the size of the icon to tell GTK+ about our
preferred width/height: what we really care about is the size of our
parent, since we're filling it anyway.
taken from:
https://git.gnome.org/browse/gnome-panel/commit/?h=gnome-3-0&id=e870aaa
| -rw-r--r-- | mate-panel/button-widget.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/mate-panel/button-widget.c b/mate-panel/button-widget.c index 055097a6..a664c075 100644 --- a/mate-panel/button-widget.c +++ b/mate-panel/button-widget.c @@ -243,6 +243,7 @@ button_widget_reload_pixbuf (ButtonWidget *button) g_free (error); } +#if !GTK_CHECK_VERSION (3, 0, 0) /* We need to add a child to the button to get the right allocation of the pixbuf. * When the button is created without a pixbuf, get_preferred_width/height are * called the first time when the widget is allocated and 0x0 size is cached by @@ -252,6 +253,7 @@ button_widget_reload_pixbuf (ButtonWidget *button) * is never used. We are overriding the draw() method, so having a child doesn't * affect the widget rendering anyway. */ +#endif gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_pixbuf (button->priv->pixbuf)); } @@ -646,14 +648,18 @@ button_widget_get_preferred_width (GtkWidget *widget, gint *minimal_width, gint *natural_width) { - ButtonWidget *button_widget = BUTTON_WIDGET (widget); + ButtonWidget *button_widget = BUTTON_WIDGET (widget); + GtkWidget *parent; + int size; - if (button_widget->priv->pixbuf == NULL ) { - *minimal_width = *natural_width = 1; - return; - } + parent = gtk_widget_get_parent (widget); - *minimal_width = *natural_width = gdk_pixbuf_get_width (button_widget->priv->pixbuf); + if (button_widget->priv->orientation & PANEL_HORIZONTAL_MASK) + size = gtk_widget_get_allocated_height (parent); + else + size = gtk_widget_get_allocated_width (parent); + + *minimal_width = *natural_width = size; } static void @@ -662,13 +668,17 @@ button_widget_get_preferred_height (GtkWidget *widget, gint *natural_height) { ButtonWidget *button_widget = BUTTON_WIDGET (widget); + GtkWidget *parent; + int size; - if (button_widget->priv->pixbuf == NULL ) { - *minimal_height = *natural_height = 1; - return; - } + parent = gtk_widget_get_parent (widget); + + if (button_widget->priv->orientation & PANEL_HORIZONTAL_MASK) + size = gtk_widget_get_allocated_height (parent); + else + size = gtk_widget_get_allocated_width (parent); - *minimal_height = *natural_height = gdk_pixbuf_get_height (button_widget->priv->pixbuf); + *minimal_height = *natural_height = size; } #else static void |