invert vertical_workspaces cases (we want to go down each column if it's

2003-01-05  Havoc Pennington  <hp@pobox.com>

	* src/screen.c (meta_screen_calc_workspace_layout): invert
	vertical_workspaces cases (we want to go down each column if
	it's vertical, and across each row if horizontal). Patch
	from readams@hmc.edu
This commit is contained in:
Havoc Pennington 2003-01-06 02:59:19 +00:00 committed by Havoc Pennington
parent a8f93c454a
commit 036747fba5
2 changed files with 56 additions and 49 deletions

View File

@ -1,9 +1,16 @@
2003-01-05 Havoc Pennington <hp@pobox.com>
* src/screen.c (meta_screen_calc_workspace_layout): invert
vertical_workspaces cases (we want to go down each column if
it's vertical, and across each row if horizontal). Patch
from readams@hmc.edu
2003-01-05 Pablo Saratxaga <pablo@mandrakesoft.com> 2003-01-05 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Macedonian (mk) to ALL_LINGUAS * configure.in: Added Macedonian (mk) to ALL_LINGUAS
2003-01-05 Havoc Pennington <hp@pobox.com> 2003-01-05 Havoc Pennington <hp@pobox.com>
* src/frames.c (meta_frames_apply_shapes): put in the * src/frames.c (meta_frames_apply_shapes): put in the
HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0 HAVE_GTK_MULTIHEAD conditionals so we build with GTK 2.0

View File

@ -1684,21 +1684,6 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
{ {
case META_SCREEN_TOPLEFT: case META_SCREEN_TOPLEFT:
if (screen->vertical_workspaces) if (screen->vertical_workspaces)
{
r = 0;
while (r < rows)
{
c = 0;
while (c < cols)
{
grid[r*cols+c] = i;
++i;
++c;
}
++r;
}
}
else
{ {
c = 0; c = 0;
while (c < cols) while (c < cols)
@ -1713,24 +1698,24 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
++c; ++c;
} }
} }
else
{
r = 0;
while (r < rows)
{
c = 0;
while (c < cols)
{
grid[r*cols+c] = i;
++i;
++c;
}
++r;
}
}
break; break;
case META_SCREEN_TOPRIGHT: case META_SCREEN_TOPRIGHT:
if (screen->vertical_workspaces) if (screen->vertical_workspaces)
{
r = 0;
while (r < rows)
{
c = cols - 1;
while (c >= 0)
{
grid[r*cols+c] = i;
++i;
--c;
}
++r;
}
}
else
{ {
c = cols - 1; c = cols - 1;
while (c >= 0) while (c >= 0)
@ -1745,24 +1730,24 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
--c; --c;
} }
} }
break; else
case META_SCREEN_BOTTOMLEFT:
if (screen->vertical_workspaces)
{ {
r = rows - 1; r = 0;
while (r >= 0) while (r < rows)
{ {
c = 0; c = cols - 1;
while (c < cols) while (c >= 0)
{ {
grid[r*cols+c] = i; grid[r*cols+c] = i;
++i; ++i;
++c; --c;
} }
--r; ++r;
} }
} }
else break;
case META_SCREEN_BOTTOMLEFT:
if (screen->vertical_workspaces)
{ {
c = 0; c = 0;
while (c < cols) while (c < cols)
@ -1777,24 +1762,24 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
++c; ++c;
} }
} }
break; else
case META_SCREEN_BOTTOMRIGHT:
if (screen->vertical_workspaces)
{ {
r = rows - 1; r = rows - 1;
while (r >= 0) while (r >= 0)
{ {
c = cols - 1; c = 0;
while (c >= 0) while (c < cols)
{ {
grid[r*cols+c] = i; grid[r*cols+c] = i;
++i; ++i;
--c; ++c;
} }
--r; --r;
} }
} }
else break;
case META_SCREEN_BOTTOMRIGHT:
if (screen->vertical_workspaces)
{ {
c = cols - 1; c = cols - 1;
while (c >= 0) while (c >= 0)
@ -1809,6 +1794,21 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
--c; --c;
} }
} }
else
{
r = rows - 1;
while (r >= 0)
{
c = cols - 1;
while (c >= 0)
{
grid[r*cols+c] = i;
++i;
--c;
}
--r;
}
}
break; break;
} }
@ -1852,7 +1852,7 @@ meta_screen_calc_workspace_layout (MetaScreen *screen,
r = 0; r = 0;
while (r < layout->rows) while (r < layout->rows)
{ {
meta_verbose (""); meta_verbose (" ");
meta_push_no_msg_prefix (); meta_push_no_msg_prefix ();
c = 0; c = 0;
while (c < layout->cols) while (c < layout->cols)