diff options
| author | lukefromdc <[email protected]> | 2018-05-07 21:40:30 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-05-12 21:23:40 +0200 |
| commit | 6e0188bf03c24558cc1ecd1dd6244eda8137b48e (patch) | |
| tree | 5d49a99eabc85761ecf77c5b7e26e6bc8fc01526 | |
| parent | bc795840feb89b3d764913ec43aeb8299f922c88 (diff) | |
| download | mate-panel-6e0188bf03c24558cc1ecd1dd6244eda8137b48e.tar.bz2 mate-panel-6e0188bf03c24558cc1ecd1dd6244eda8137b48e.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.c | 21 |
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 |