if only one right-corner button, use right_right_background not

2002-10-24  Havoc Pennington  <hp@redhat.com>

	* src/theme.c (meta_frame_layout_calc_geometry): if only one
	right-corner button, use right_right_background not
	right_left_background
This commit is contained in:
Havoc Pennington 2002-10-24 20:47:19 +00:00 committed by Havoc Pennington
parent bc46b2f0e0
commit c3a5c4c169
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2002-10-24 Havoc Pennington <hp@redhat.com>
* src/theme.c (meta_frame_layout_calc_geometry): if only one
right-corner button, use right_right_background not
right_left_background
2002-10-24 Havoc Pennington <hp@pobox.com> 2002-10-24 Havoc Pennington <hp@pobox.com>
* src/window.c (meta_window_get_icon_geometry): make public * src/window.c (meta_window_get_icon_geometry): make public

View File

@ -575,10 +575,10 @@ meta_frame_layout_calc_geometry (const MetaFrameLayout *layout,
i = 0; i = 0;
while (i < n_left) while (i < n_left)
{ {
if (i == 0) if (i == 0) /* prefer left background if only one button */
left_bg_rects[i] = &fgeom->left_left_background;
else if (i == (n_left - 1))
left_bg_rects[i] = &fgeom->left_right_background; left_bg_rects[i] = &fgeom->left_right_background;
else if (i == (n_left - 1))
left_bg_rects[i] = &fgeom->left_left_background;
else else
left_bg_rects[i] = &fgeom->left_middle_backgrounds[i-1]; left_bg_rects[i] = &fgeom->left_middle_backgrounds[i-1];
@ -588,9 +588,9 @@ meta_frame_layout_calc_geometry (const MetaFrameLayout *layout,
i = 0; i = 0;
while (i < n_right) while (i < n_right)
{ {
if (i == 0) if (i == (n_right - 1)) /* prefer right background if only one button */
right_bg_rects[i] = &fgeom->right_left_background; right_bg_rects[i] = &fgeom->right_left_background;
else if (i == (n_right - 1)) else if (i == 0)
right_bg_rects[i] = &fgeom->right_right_background; right_bg_rects[i] = &fgeom->right_right_background;
else else
right_bg_rects[i] = &fgeom->right_middle_backgrounds[i-1]; right_bg_rects[i] = &fgeom->right_middle_backgrounds[i-1];