summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-07-20 17:36:49 -0400
committerraveit65 <[email protected]>2018-07-28 11:25:52 +0200
commita6733367ce2d9b81370d5a7e198c72a4dfea9d5b (patch)
tree280e40c65cb17c4b35cbefa0cfd0dad00d62239c
parentb8c0ddea091188530dc3154e37b669cf8b082164 (diff)
downloadmate-panel-a6733367ce2d9b81370d5a7e198c72a4dfea9d5b.tar.bz2
mate-panel-a6733367ce2d9b81370d5a7e198c72a4dfea9d5b.tar.xz
GTK 3.23: fix applet size allocation
Limit workaround for GTK 3.22 double width/height allocation to GTK 3.22 builds only
-rw-r--r--libmate-panel-applet/mate-panel-applet.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index 2870bcae..8d2751a7 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -1054,21 +1054,23 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget,
int *minimum_width,
int *natural_width)
{
- MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
- gint scale;
-
GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->get_preferred_width (widget,
minimum_width,
natural_width);
+#if !GTK_CHECK_VERSION (3, 23, 0)
+ MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
if (applet->priv->out_of_process) {
- /* Out-of-process applets end up scaled up doubly. We divide by the scale factor to ensure
+ /* Out-of-process applets end up scaled up doubly with GTK 3.22.
+ * For these builds divide by the scale factor to ensure
* they are back at their own intended size.
*/
+ gint scale;
scale = gtk_widget_get_scale_factor (widget);
*minimum_width /= scale;
*natural_width /= scale;
}
+#endif
}
static void
@@ -1076,21 +1078,22 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
int *minimum_height,
int *natural_height)
{
- MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
- gint scale;
-
GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->get_preferred_height (widget,
minimum_height,
natural_height);
-
+#if !GTK_CHECK_VERSION (3, 23, 0)
+ MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
if (applet->priv->out_of_process) {
- /* Out-of-process applets end up scaled up doubly. We divide by the scale factor to ensure
+ gint scale;
+ /* Out-of-process applets end up scaled up doubly with GTK 3.22.
+ * For these builds divide by the scale factor to ensure
* they are back at their own intended size.
*/
scale = gtk_widget_get_scale_factor (widget);
*minimum_height /= scale;
*natural_height /= scale;
}
+#endif
}
static GtkSizeRequestMode