summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-05-07 21:40:30 -0400
committerlukefromdc <[email protected]>2018-05-09 02:03:22 -0400
commitf775e8987f8279ea2fb259126e61d0b26cf78817 (patch)
treead4715920615c6046d7fe1b2bacf6fa3e0d07df9
parent8e196dacf877b90303c0d447f089d98373b37960 (diff)
downloadmate-panel-f775e8987f8279ea2fb259126e61d0b26cf78817.tar.bz2
mate-panel-f775e8987f8279ea2fb259126e61d0b26cf78817.tar.xz
fix rendering and removal of in-process applets on unexpanded panel
Fix https://github.com/mate-desktop/mate-panel/issues/797 and https://github.com/mate-desktop/mate-panel/issues/799
-rw-r--r--libmate-panel-applet/mate-panel-applet.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index ec481ccf..2870bcae 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -1096,18 +1096,15 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget,
static GtkSizeRequestMode
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)
- return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
-
- return GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
+ /*Do not use GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH
+ *or GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT
+ *to avoid problems with in-process applets
+ *when the panel is not expanded
+ *See https://github.com/mate-desktop/mate-panel/issues/797
+ *and https://github.com/mate-desktop/mate-panel/issues/799
+ *Out of process applets already use GTK_SIZE_REQUEST_CONSTANT_SIZE
+ */
+ return GTK_SIZE_REQUEST_CONSTANT_SIZE;
}
static void