From bb35f88925d4741aa864a0ca626600b737dddd91 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 16 May 2002 20:47:29 +0000 Subject: [PATCH] lock desktop to position 0,0 2002-05-16 Havoc Pennington * src/window.c (constrain_position): lock desktop to position 0,0 --- ChangeLog | 4 ++++ src/window.c | 16 +++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 409344961..7bf95c41d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-05-16 Havoc Pennington + + * src/window.c (constrain_position): lock desktop to position 0,0 + 2002-05-16 Havoc Pennington * src/window.c (meta_window_show): don't focus dock, desktop, diff --git a/src/window.c b/src/window.c index 1f8a1564c..9e16f4476 100644 --- a/src/window.c +++ b/src/window.c @@ -1331,6 +1331,8 @@ meta_window_show (MetaWindow *window) case META_WINDOW_DESKTOP: case META_WINDOW_UTILITY: case META_WINDOW_SPLASHSCREEN: + case META_WINDOW_TOOLBAR: + case META_WINDOW_MENU: /* don't focus these */ break; case META_WINDOW_NORMAL: @@ -5023,7 +5025,16 @@ constrain_position (MetaWindow *window, if (!window->placed && window->calc_placement) meta_window_place (window, fgeom, x, y, &x, &y); - if (window->fullscreen) + if (window->type == META_WINDOW_DESKTOP) + { + x = 0; + y = 0; + } + else if (window->type == META_WINDOW_DOCK) + { + ; /* let it do whatever */ + } + else if (window->fullscreen) { x = 0; y = 0; @@ -5058,8 +5069,7 @@ constrain_position (MetaWindow *window, y += (work_area.height - window->rect.height - (window->frame ? (fgeom->top_height + fgeom->bottom_height) : 0)) / 2; } - else if (window->type != META_WINDOW_DESKTOP && - window->type != META_WINDOW_DOCK) + else { int nw_x, nw_y; int se_x, se_y;