summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Kareh <[email protected]>2018-07-27 14:08:09 -0400
committerVictor Kareh <[email protected]>2018-07-27 14:08:09 -0400
commit31930d0b39b3bf26bcc53b2c20e61ecd4779f397 (patch)
tree4a733572dc3119f7e65c6e7e369c087d7b4e337d
parent139f1837cea61ddf9971c3f7f1530de9247121d3 (diff)
downloadmate-panel-31930d0b39b3bf26bcc53b2c20e61ecd4779f397.tar.bz2
mate-panel-31930d0b39b3bf26bcc53b2c20e61ecd4779f397.tar.xz
applets: Guard against GTK scale-factor fixes on GtkSocket
-rw-r--r--applets/notification_area/system-tray/na-tray-child.c6
-rw-r--r--applets/wncklet/window-list.c6
-rw-r--r--libmate-panel-applet/mate-panel-applet.c9
3 files changed, 11 insertions, 10 deletions
diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c
index d29da781..ded740ad 100644
--- a/applets/notification_area/system-tray/na-tray-child.c
+++ b/applets/notification_area/system-tray/na-tray-child.c
@@ -115,11 +115,11 @@ na_tray_child_style_set (GtkWidget *widget,
*/
}
-#if !GTK_CHECK_VERSION (3, 23, 0)
+#if !GTK_CHECK_VERSION (3, 22, 31)
static void
na_tray_child_get_preferred_width (GtkWidget *widget,
gint *minimal_width,
- gint *natural_width)
+ gint *natural_width)
{
gint scale;
scale = gtk_widget_get_scale_factor (widget);
@@ -384,7 +384,7 @@ na_tray_child_class_init (NaTrayChildClass *klass)
widget_class->style_set = na_tray_child_style_set;
widget_class->realize = na_tray_child_realize;
-#if !GTK_CHECK_VERSION (3, 23, 0)
+#if !GTK_CHECK_VERSION (3, 22, 31)
widget_class->get_preferred_width = na_tray_child_get_preferred_width;
widget_class->get_preferred_height = na_tray_child_get_preferred_height;
#endif
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index f6055e43..35b87c74 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -42,7 +42,7 @@ typedef struct {
GtkOrientation orientation;
int size;
-#ifndef WNCKLET_INPROCESS
+#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31)
gboolean needs_hints;
#endif
@@ -322,7 +322,7 @@ static void applet_size_allocate(GtkWidget *widget, GtkAllocation *allocation, T
g_assert(len % 2 == 0);
-#ifndef WNCKLET_INPROCESS
+#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31)
/* HACK: When loading the WnckTasklist initially, it reports size hints as though there were
* no elements in the Tasklist. This causes a rendering issue when built out-of-process in
* HiDPI displays. We keep a flag to skip size hinting until WnckTasklist has something to
@@ -427,7 +427,7 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
tasklist->size = mate_panel_applet_get_size(applet);
-#ifndef WNCKLET_INPROCESS
+#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31)
tasklist->needs_hints = FALSE;
#endif
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index e298b875..0bbd9e6e 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -1059,11 +1059,11 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget,
minimum_width,
natural_width);
-#if !GTK_CHECK_VERSION (3, 23, 0)
+#if !GTK_CHECK_VERSION (3, 22, 31)
MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
if (applet->priv->out_of_process) {
/* Out-of-process applets end up scaled up doubly with GTK 3.22.
- * For these builds divide by the scale factor to ensure
+ * For these builds divide by the scale factor to ensure
* they are back at their own intended size.
*/
gint scale;
@@ -1082,12 +1082,13 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
GTK_WIDGET_CLASS (mate_panel_applet_parent_class)->get_preferred_height (widget,
minimum_height,
natural_height);
-#if !GTK_CHECK_VERSION (3, 23, 0)
+
+#if !GTK_CHECK_VERSION (3, 22, 31)
MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
if (applet->priv->out_of_process) {
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
+ * 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);