[mate-panel] 02/02: debian/patches: Add 0002_fix_out_process_applets_for_hidpi.patch. Fix out-of-process applet sizes for HiDPI.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-panel.

commit 30b2f3f8984a87ea4f8ce62b208f80a22f7a2e81
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Mon Mar 5 10:00:06 2018 +0000

    debian/patches: Add 0002_fix_out_process_applets_for_hidpi.patch. Fix out-of-process applet sizes for HiDPI.
---
 .../0002_fix_out_process_applets_for_hidpi.patch   | 55 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/0002_fix_out_process_applets_for_hidpi.patch b/debian/patches/0002_fix_out_process_applets_for_hidpi.patch
new file mode 100644
index 0000000..012e253
--- /dev/null
+++ b/debian/patches/0002_fix_out_process_applets_for_hidpi.patch
@@ -0,0 +1,55 @@
+Author: Victor Kareh <vkareh at vkareh.net>
+Description: Fix out-of-process applet sizes for HiDPI
+
+diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
+index 25430ae8..a1b49122 100644
+--- a/libmate-panel-applet/mate-panel-applet.c
++++ b/libmate-panel-applet/mate-panel-applet.c
+@@ -1026,10 +1026,8 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget,
+ 		 * they are back at their own intended size.
+ 		 */
+ 		scale = gtk_widget_get_scale_factor (widget);
+-		if (scale) {
+-			*minimum_width /= scale;
+-			*natural_width /= scale;
+-		}
++		*minimum_width /= scale;
++		*natural_width /= scale;
+ 	}
+ }
+ 
+@@ -1050,10 +1048,8 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
+ 		 * they are back at their own intended size.
+ 		 */
+ 		scale = gtk_widget_get_scale_factor (widget);
+-		if (scale) {
+-			*minimum_height /= scale;
+-			*natural_height /= scale;
+-		}
++		*minimum_height /= scale;
++		*natural_height /= scale;
+ 	}
+ }
+ 
+@@ -1063,6 +1059,9 @@ mate_panel_applet_get_request_mode (GtkWidget *widget)
+ 	MatePanelApplet *applet = MATE_PANEL_APPLET (widget);
+ 	MatePanelAppletOrient orientation;
+ 
++	if (applet->priv->out_of_process)
++		return GTK_SIZE_REQUEST_CONSTANT_SIZE;
++
+ 	orientation = mate_panel_applet_get_orient (applet);
+ 	if (orientation == MATE_PANEL_APPLET_ORIENT_UP ||
+ 	    orientation == MATE_PANEL_APPLET_ORIENT_DOWN)
+@@ -1500,9 +1499,9 @@ mate_panel_applet_change_background(MatePanelApplet *applet,
+ 	GdkWindow* window;
+ 
+ 	if (applet->priv->out_of_process)
+-		window = gtk_widget_get_window (applet->priv->plug);
++		window = gtk_widget_get_window (GTK_WIDGET (applet->priv->plug));
+ 	else
+-		window = gtk_widget_get_window GTK_WIDGET((applet));
++		window = gtk_widget_get_window (GTK_WIDGET (applet));
+ 
+ 	gtk_widget_set_app_paintable(GTK_WIDGET(applet),TRUE);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index db90441..de75f28 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001_scale_monitor_geometries.patch
+0002_fix_out_process_applets_for_hidpi.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-panel.git