Skip to content

Commit

Permalink
Fix out-of-process applet sizes for HiDPI
Browse files Browse the repository at this point in the history
  • Loading branch information
vkareh authored and lukefromdc committed Mar 19, 2018
1 parent fa5cde3 commit ff04f33
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions libmate-panel-applet/mate-panel-applet.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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;
}
}

Expand All @@ -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)
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit ff04f33

Please sign in to comment.