1 files changed, 7 insertions, 16 deletions
diff --git a/mate-panel/panel-struts.c b/mate-panel/panel-struts.c
index 00968ab7..7c0a9e38 100644
--- a/mate-panel/panel-struts.c
+++ b/mate-panel/panel-struts.c
@@ -319,8 +319,8 @@ panel_struts_set_window_hint (PanelToplevel *toplevel)
 panel_xutils_set_strut (gtk_widget_get_window (widget),
 strut->orientation,
 strut_size,
- strut->allocated_strut_start * scale,
- strut->allocated_strut_end * scale,
+ strut->allocated_strut_start,
+ strut->allocated_strut_end,
 &strut->allocated_geometry,
 scale);
 }
@@ -412,8 +412,7 @@ panel_struts_register_strut (PanelToplevel *toplevel,
 PanelOrientation orientation,
 int strut_size,
 int strut_start,
- int strut_end,
- gint scale)
+ int strut_end)
 {
 PanelStrut *strut;
 gboolean new_strut = FALSE;
@@ -451,33 +450,25 @@ panel_struts_register_strut (PanelToplevel *toplevel,
 strut->geometry.x = strut->strut_start;
 strut->geometry.y = monitor_y;
 strut->geometry.width = strut->strut_end - strut->strut_start + 1;
- strut->geometry.height = strut->strut_size / scale;
- if (scale > 1)
- strut->geometry.width -= (strut->strut_size / scale);
+ strut->geometry.height = strut->strut_size;
 break;
 case PANEL_ORIENTATION_BOTTOM:
 strut->geometry.x = strut->strut_start;
 strut->geometry.y = monitor_y + monitor_height - strut->strut_size;
 strut->geometry.width = strut->strut_end - strut->strut_start + 1;
- strut->geometry.height = strut->strut_size / scale;
- if (scale > 1)
- strut->geometry.width -= (strut->strut_size / scale);
+ strut->geometry.height = strut->strut_size;
 break;
 case PANEL_ORIENTATION_LEFT:
 strut->geometry.x = monitor_x;
 strut->geometry.y = strut->strut_start;
- strut->geometry.width = strut->strut_size / scale;
+ strut->geometry.width = strut->strut_size;
 strut->geometry.height = strut->strut_end - strut->strut_start + 1;
- if (scale > 1)
- strut->geometry.height -= (strut->strut_size / scale);
 break;
 case PANEL_ORIENTATION_RIGHT:
 strut->geometry.x = monitor_x + monitor_width - strut->strut_size;
 strut->geometry.y = strut->strut_start;
- strut->geometry.width = strut->strut_size / scale;
+ strut->geometry.width = strut->strut_size;
 strut->geometry.height = strut->strut_end - strut->strut_start + 1;
- if (scale > 1)
- strut->geometry.height -= (strut->strut_size / scale);
 break;
 }