diff options
| -rw-r--r-- | mate-panel/panel-widget.c | 154 |
1 files changed, 106 insertions, 48 deletions
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c index ffa9d3b1..b77fa1af 100644 --- a/mate-panel/panel-widget.c +++ b/mate-panel/panel-widget.c @@ -63,15 +63,19 @@ static gboolean mate_panel_applet_in_drag = FALSE; static GtkWidget *saved_focus_widget = NULL; #if GTK_CHECK_VERSION (3, 0, 0) +static void panel_widget_get_preferred_size (GtkWidget *widget, + GtkRequisition *minimum_size, + GtkRequisition *natural_size); static void panel_widget_get_preferred_width (GtkWidget *widget, - gint *minimum_width, - gint *natural_width); + gint *minimum_width, + gint *natural_width); static void panel_widget_get_preferred_height (GtkWidget *widget, - gint *minimum_height, - gint *natural_height); -#endif + gint *minimum_height, + gint *natural_height); +#else static void panel_widget_size_request (GtkWidget *widget, GtkRequisition *requisition); +#endif static void panel_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void panel_widget_cadd (GtkContainer *container, @@ -1232,7 +1236,13 @@ panel_widget_right_stick(PanelWidget *panel,int old_size) } static void -panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition) +#if GTK_CHECK_VERSION (3, 0, 0) +panel_widget_get_preferred_size(GtkWidget *widget, + GtkRequisition *minimum_size, + GtkRequisition *natural_size) +#else +panel_widget_size_request(GtkWidget *widget, GtkRequisition *minimum_size) +#endif { PanelWidget *panel; GList *list; @@ -1240,53 +1250,81 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition) gboolean dont_fill; g_return_if_fail(PANEL_IS_WIDGET(widget)); - g_return_if_fail(requisition!=NULL); + g_return_if_fail(minimum_size != NULL); panel = PANEL_WIDGET(widget); - if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { - requisition->width = 0; - requisition->height = panel->sz; + if (panel->orient == GTK_ORIENTATION_HORIZONTAL) { + minimum_size->width = 0; + minimum_size->height = panel->sz; } else { - requisition->height = 0; - requisition->width = panel->sz; + minimum_size->height = 0; + minimum_size->width = panel->sz; } +#if GTK_CHECK_VERSION (3, 0, 0) + natural_size->width = minimum_size->width; + natural_size->height = minimum_size->height; +#endif ad_with_hints = NULL; - for(list = panel->applet_list; list!=NULL; list = g_list_next(list)) { + for (list = panel->applet_list; list!=NULL; list = g_list_next(list)) { AppletData *ad = list->data; - GtkRequisition chreq; + GtkRequisition child_min_size; #if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_get_preferred_size (ad->applet, &chreq, NULL); + GtkRequisition child_natural_size; + gtk_widget_get_preferred_size(ad->applet, + &child_min_size, + &child_natural_size); #else - gtk_widget_size_request(ad->applet, &chreq); + gtk_widget_size_request(ad->applet, &child_min_size); #endif if (panel->orient == GTK_ORIENTATION_HORIZONTAL) { - if (requisition->height < chreq.height && !ad->size_constrained) - requisition->height = chreq.height; + if (minimum_size->height < child_min_size.height && + !ad->size_constrained) + minimum_size->height = child_min_size.height; +#if GTK_CHECK_VERSION (3, 0, 0) + if (natural_size->height < child_natural_size.height && + !ad->size_constrained) + natural_size->height = child_natural_size.height; +#endif if (panel->packed && ad->expand_major && ad->size_hints) ad_with_hints = g_list_prepend (ad_with_hints, ad); else if (panel->packed) - requisition->width += chreq.width; + { + minimum_size->width += child_min_size.width; +#if GTK_CHECK_VERSION (3, 0, 0) + natural_size->width += child_natural_size.width; +#endif + } } else { - if (requisition->width < chreq.width && !ad->size_constrained) - requisition->width = chreq.width; + if (minimum_size->width < child_min_size.width && + !ad->size_constrained) + minimum_size->width = child_min_size.width; +#if GTK_CHECK_VERSION (3, 0, 0) + if (natural_size->width < child_min_size.width && + !ad->size_constrained) + natural_size->width = child_min_size.width; +#endif if (panel->packed && ad->expand_major && ad->size_hints) ad_with_hints = g_list_prepend (ad_with_hints, ad); else if (panel->packed) - requisition->height += chreq.height; + { + minimum_size->height += child_min_size.height; +#if GTK_CHECK_VERSION (3, 0, 0) + natural_size->height += child_natural_size.height; +#endif + } } } - panel->nb_applets_size_hints = 0; if (panel->applets_hints != NULL) g_free (panel->applets_hints); @@ -1295,11 +1333,17 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition) g_free (panel->applets_using_hint); panel->applets_using_hint = NULL; - if(!panel->packed) { - if(panel->orient == GTK_ORIENTATION_HORIZONTAL) { - requisition->width = panel->size; + if (!panel->packed) { + if (panel->orient == GTK_ORIENTATION_HORIZONTAL) { + minimum_size->width = panel->size; +#if GTK_CHECK_VERSION (3, 0, 0) + natural_size->width = panel->size; +#endif } else { - requisition->height = panel->size; + minimum_size->height = panel->size; +#if GTK_CHECK_VERSION (3, 0, 0) + natural_size->height = panel->size; +#endif } } else { /* put the list in the correct order: this is important @@ -1329,37 +1373,51 @@ panel_widget_size_request(GtkWidget *widget, GtkRequisition *requisition) dont_fill = panel->packed && panel->nb_applets_size_hints != 0; if (panel->orient == GTK_ORIENTATION_HORIZONTAL) { - if (requisition->width < 12 && !dont_fill) - requisition->width = 12; - if (requisition->height < 12) - requisition->height = 12; + if (minimum_size->width < 12 && !dont_fill) + minimum_size->width = 12; + if (minimum_size->height < 12) + minimum_size->height = 12; +#if GTK_CHECK_VERSION (3, 0, 0) + if (natural_size->width < 12 && !dont_fill) + natural_size->width = 12; + if (natural_size->height < 12) + natural_size->height = 12; +#endif } else { - if (requisition->width < 12) - requisition->width = 12; - if (requisition->height < 12 && !dont_fill) - requisition->height = 12; + if (minimum_size->width < 12) + minimum_size->width = 12; + if (minimum_size->height < 12 && !dont_fill) + minimum_size->height = 12; +#if GTK_CHECK_VERSION (3, 0, 0) + if (natural_size->width < 12) + natural_size->width = 12; + if (natural_size->height < 12 && !dont_fill) + natural_size->height = 12; +#endif } } #if GTK_CHECK_VERSION (3, 0, 0) static void -panel_widget_get_preferred_width (GtkWidget *widget, - gint *minimum_width, - gint *natural_width) +panel_widget_get_preferred_width(GtkWidget *widget, + gint *minimum_width, + gint *natural_width) { - GtkRequisition req; - panel_widget_size_request (widget, &req); - *minimum_width = *natural_width = req.width; + GtkRequisition req_min, req_natural; + panel_widget_get_preferred_size(widget, &req_min, &req_natural); + *minimum_width = req_min.width; + *natural_width = req_natural.width; } static void -panel_widget_get_preferred_height (GtkWidget *widget, - gint *minimum_height, - gint *natural_height) -{ - GtkRequisition req; - panel_widget_size_request (widget, &req); - *minimum_height = *natural_height = req.height; +panel_widget_get_preferred_height(GtkWidget *widget, + gint *minimum_height, + gint *natural_height) +{ + GtkRequisition req_min, req_natural; + panel_widget_get_preferred_size(widget, &req_min, &req_natural); + *minimum_height = req_min.height; + *natural_height = req_natural.height; } #endif |