Commit 6f6fcf1b authored by Cosimo Cecchi's avatar Cosimo Cecchi

Revert "desktop-canvas: set margins according to the primary workarea"

This fix proved to be more problematic than the original bug, so we'll
revert to the original behavior for now.

This reverts commit 1292610b.

https://bugzilla.gnome.org/show_bug.cgi?id=695336
parent 4d912883
......@@ -99,27 +99,27 @@ canvas_container_set_workarea (NautilusCanvasContainer *canvas_container,
int n_items)
{
int left, right, top, bottom;
int screen_width, screen_height;
int i;
GdkRectangle geometry;
left = right = top = bottom = 0;
gdk_screen_get_monitor_geometry (screen, gdk_screen_get_primary_monitor (screen), &geometry);
for (i = 0; i < n_items; i += 4) {
GdkRectangle workarea;
screen_width = gdk_screen_get_width (screen);
screen_height = gdk_screen_get_height (screen);
workarea.x = workareas[i];
workarea.y = workareas[i + 1];
workarea.width = workareas[i + 2];
workarea.height = workareas[i + 3];
for (i = 0; i < n_items; i += 4) {
int x = workareas [i];
int y = workareas [i + 1];
int width = workareas [i + 2];
int height = workareas [i + 3];
if (!gdk_rectangle_intersect (&geometry, &workarea, &workarea))
if ((x + width) > screen_width || (y + height) > screen_height)
continue;
left = MAX (left, workarea.x);
right = MAX (right, (geometry.x + geometry.width) - (workarea.x + workarea.width));
top = MAX (top, workarea.y);
bottom = MAX (bottom, (geometry.y + geometry.height) - (workarea.y + workarea.height));
left = MAX (left, x);
right = MAX (right, screen_width - width - x);
top = MAX (top, y);
bottom = MAX (bottom, screen_height - height - y);
}
nautilus_canvas_container_set_margins (canvas_container,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment