[mate-panel] 02/04: debian/patches: Drop 0001_down_scale_out_process_applet.patch. Applied upstream.

[Martin Wimpress]

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

flexiondotorg-guest pushed a commit to branch ubuntu/bionic
in repository mate-panel.

commit 9b320b85e612274d7f61f2a5bf779f3e6f8d86f8
Author: Martin Wimpress <martin.wimpress at ubuntu.com>
Date:   Fri Jan 26 16:27:32 2018 +0000

    debian/patches: Drop 0001_down_scale_out_process_applet.patch. Applied upstream.
---
 .../0001_down_scale_out_process_applet.patch       | 127 ---------------------
 debian/patches/series                              |   1 -
 2 files changed, 128 deletions(-)

diff --git a/debian/patches/0001_down_scale_out_process_applet.patch b/debian/patches/0001_down_scale_out_process_applet.patch
deleted file mode 100644
index db003e6..0000000
--- a/debian/patches/0001_down_scale_out_process_applet.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
-index 2e6f5b33..74b3f4cd 100644
---- a/libmate-panel-applet/mate-panel-applet.c
-+++ b/libmate-panel-applet/mate-panel-applet.c
-@@ -1020,29 +1020,44 @@ mate_panel_applet_popup_menu (GtkWidget *widget)
- 	return TRUE;
- }
- 
--#if !GTK_CHECK_VERSION (3, 18, 0)
- static void
- mate_panel_applet_get_preferred_width (GtkWidget *widget,
- 				       int       *minimum_width,
- 				       int       *natural_width)
- {
--	int focus_width = 0;
-+	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 (!mate_panel_applet_can_focus (widget))
--		return;
- 
--	/* We are deliberately ignoring focus-padding here to
--	 * save valuable panel real estate.
--	 */
--	gtk_widget_style_get (widget,
--			      "focus-line-width", &focus_width,
--			      NULL);
-+	if (applet->priv->out_of_process) {
-+		/* Out-of-process applets end up scaled up doubly. We divide by the scale factor to ensure
-+		 * 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 += 2 * focus_width;
--	*natural_width += 2 * focus_width;
-+#if !GTK_CHECK_VERSION (3, 18, 0)
-+	if (mate_panel_applet_can_focus (widget)) {
-+		int focus_width = 0;
-+
-+		/* We are deliberately ignoring focus-padding here to
-+		 * save valuable panel real estate.
-+		 */
-+		gtk_widget_style_get (widget,
-+				"focus-line-width", &focus_width,
-+				NULL);
-+
-+		*minimum_width += 2 * focus_width;
-+		*natural_width += 2 * focus_width;
-+	}
-+#endif
- }
- 
- static void
-@@ -1050,25 +1065,40 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
- 					int       *minimum_height,
- 					int       *natural_height)
- {
--	int focus_width = 0;
-+	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 (!mate_panel_applet_can_focus (widget))
--		return;
-+										minimum_height,
-+										natural_height);
- 
--	/* We are deliberately ignoring focus-padding here to
--	 * save valuable panel real estate.
--	 */
--	gtk_widget_style_get (widget,
--			      "focus-line-width", &focus_width,
--			      NULL);
-+	if (applet->priv->out_of_process) {
-+		/* Out-of-process applets end up scaled up doubly. We divide by the scale factor to ensure
-+		 * 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 += 2 * focus_width;
--	*natural_height += 2 * focus_width;
--}
-+#if !GTK_CHECK_VERSION (3, 18, 0)
-+	if (mate_panel_applet_can_focus (widget)) {
-+		int focus_width = 0;
-+
-+		/* We are deliberately ignoring focus-padding here to
-+		 * save valuable panel real estate.
-+		 */
-+		gtk_widget_style_get (widget,
-+				"focus-line-width", &focus_width,
-+				NULL);
-+
-+		*minimum_height += 2 * focus_width;
-+		*natural_height += 2 * focus_width;
-+	}
- #endif
-+}
- 
- static GtkSizeRequestMode
- mate_panel_applet_get_request_mode (GtkWidget *widget)
-@@ -1922,10 +1952,8 @@ mate_panel_applet_class_init (MatePanelAppletClass *klass)
- 	widget_class->button_press_event = mate_panel_applet_button_press;
- 	widget_class->button_release_event = mate_panel_applet_button_release;
- 	widget_class->get_request_mode = mate_panel_applet_get_request_mode;
--#if !GTK_CHECK_VERSION (3, 18, 0)
- 	widget_class->get_preferred_width = mate_panel_applet_get_preferred_width;
- 	widget_class->get_preferred_height = mate_panel_applet_get_preferred_height;
--#endif
- 	widget_class->draw = mate_panel_applet_draw;
- 	widget_class->size_allocate = mate_panel_applet_size_allocate;
- 	widget_class->focus = mate_panel_applet_focus;
diff --git a/debian/patches/series b/debian/patches/series
index 02ce4e7..8f7d3a1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0000_hidpi.patch
-0001_down_scale_out_process_applet.patch

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