summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2002-05-16 20:47:29 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-05-16 20:47:29 +0000
commitbb35f88925d4741aa864a0ca626600b737dddd91 (patch)
treea388b836611505b6abeb1b57df7df4e81952c903
parent9b39feab952378111253657a59d9aa5d7794f809 (diff)
downloadmutter-bb35f88925d4741aa864a0ca626600b737dddd91.tar.gz
lock desktop to position 0,0
2002-05-16 Havoc Pennington <hp@redhat.com> * src/window.c (constrain_position): lock desktop to position 0,0
-rw-r--r--ChangeLog4
-rw-r--r--src/window.c16
2 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 409344961..7bf95c41d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2002-05-16 Havoc Pennington <hp@redhat.com>
+ * src/window.c (constrain_position): lock desktop to position 0,0
+
+2002-05-16 Havoc Pennington <hp@redhat.com>
+
* src/window.c (meta_window_show): don't focus dock, desktop,
etc. windows on initial map, only windows that should have focus.
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;