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
This commit is contained in:
Havoc Pennington 2002-05-16 20:47:29 +00:00 committed by Havoc Pennington
parent 9b39feab95
commit bb35f88925
2 changed files with 17 additions and 3 deletions

View File

@ -1,3 +1,7 @@
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> 2002-05-16 Havoc Pennington <hp@redhat.com>
* src/window.c (meta_window_show): don't focus dock, desktop, * src/window.c (meta_window_show): don't focus dock, desktop,

View File

@ -1331,6 +1331,8 @@ meta_window_show (MetaWindow *window)
case META_WINDOW_DESKTOP: case META_WINDOW_DESKTOP:
case META_WINDOW_UTILITY: case META_WINDOW_UTILITY:
case META_WINDOW_SPLASHSCREEN: case META_WINDOW_SPLASHSCREEN:
case META_WINDOW_TOOLBAR:
case META_WINDOW_MENU:
/* don't focus these */ /* don't focus these */
break; break;
case META_WINDOW_NORMAL: case META_WINDOW_NORMAL:
@ -5023,7 +5025,16 @@ constrain_position (MetaWindow *window,
if (!window->placed && window->calc_placement) if (!window->placed && window->calc_placement)
meta_window_place (window, fgeom, x, y, &x, &y); 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; x = 0;
y = 0; y = 0;
@ -5058,8 +5069,7 @@ constrain_position (MetaWindow *window,
y += (work_area.height - window->rect.height - y += (work_area.height - window->rect.height -
(window->frame ? (fgeom->top_height + fgeom->bottom_height) : 0)) / 2; (window->frame ? (fgeom->top_height + fgeom->bottom_height) : 0)) / 2;
} }
else if (window->type != META_WINDOW_DESKTOP && else
window->type != META_WINDOW_DOCK)
{ {
int nw_x, nw_y; int nw_x, nw_y;
int se_x, se_y; int se_x, se_y;