brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch from Björn Lindqvist to fix #98340.

Browse Source 
2006-01-20  Elijah Newren  <newren gmail com>

	Patch from Björn Lindqvist to fix #98340.

	* src/screen.c (meta_screen_ensure_tab_popup): Make sure an
	outline border is shown even if a window frame's width is 0.
	Also, correctly handle window outlines in showing desktop mode.
This commit is contained in:
Elijah Newren 2006-01-20 21:48:51 +00:00 committed by Elijah Newren
parent cc790655f2
commit 4c10722262
2 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-20 Elijah Newren <newren gmail com>
Patch from Björn Lindqvist to fix #98340.
* src/screen.c (meta_screen_ensure_tab_popup): Make sure an
outline border is shown even if a window frame's width is 0.
Also, correctly handle window outlines in showing desktop mode.
Fri Jan 20 16:42:25 2006 Søren Sandmann <sandmann@redhat.com> Fri Jan 20 16:42:25 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c: Make minimize animation update again. * src/compositor.c: Make minimize animation update again.

60
src/screen.c
View File

@ -1196,38 +1196,50 @@ meta_screen_ensure_tab_popup (MetaScreen *screen,
entries[i].demands_attention = window->wm_state_demands_attention; entries[i].demands_attention = window->wm_state_demands_attention;
if (show_type == META_TAB_SHOW_INSTANTLY || if (show_type == META_TAB_SHOW_INSTANTLY ||
!window->minimized || !entries[i].hidden ||
!meta_window_get_icon_geometry (window, &r)) !meta_window_get_icon_geometry (window, &r))
meta_window_get_outer_rect (window, &r); meta_window_get_outer_rect (window, &r);
entries[i].rect = r; entries[i].rect = r;
/* Find inside of highlight rectangle to be used /* Find inside of highlight rectangle to be used when window is
* when window is outlined for tabbing. * outlined for tabbing. This should be the size of the
* This should be the size of the east/west frame, * east/west frame, and the size of the south frame, on those
* and the size of the south frame, on those sides. * sides. On the top it should be the size of the south frame
* on the top it should be the size of the south frame
* edge. * edge.
*/ */
if (window->frame)
{
int south = window->frame->rect.height - window->frame->child_y -
window->rect.height;
int east = window->frame->child_x;
entries[i].inner_rect.x = east;
entries[i].inner_rect.y = south;
entries[i].inner_rect.width = window->rect.width;
entries[i].inner_rect.height = window->frame->rect.height - south * 2;
}
else
{
/* Use an arbitrary border size */
#define OUTLINE_WIDTH 5 #define OUTLINE_WIDTH 5
entries[i].inner_rect.x = OUTLINE_WIDTH; /* Top side */
entries[i].inner_rect.y = OUTLINE_WIDTH; if (!entries[i].hidden &&
entries[i].inner_rect.width = window->rect.width - OUTLINE_WIDTH * 2; window->frame && window->frame->bottom_height > 0 &&
entries[i].inner_rect.height = window->rect.height - OUTLINE_WIDTH * 2; window->frame->child_y >= window->frame->bottom_height)
} entries[i].inner_rect.y = window->frame->bottom_height;
else
entries[i].inner_rect.y = OUTLINE_WIDTH;
/* Bottom side */
if (!entries[i].hidden &&
window->frame && window->frame->bottom_height != 0)
entries[i].inner_rect.height = r.height
- entries[i].inner_rect.y - window->frame->bottom_height;
else
entries[i].inner_rect.height = r.height
- entries[i].inner_rect.y - OUTLINE_WIDTH;
/* Left side */
if (!entries[i].hidden && window->frame && window->frame->child_x != 0)
entries[i].inner_rect.x = window->frame->child_x;
else
entries[i].inner_rect.x = OUTLINE_WIDTH;
/* Right side */
if (!entries[i].hidden &&
window->frame && window->frame->right_width != 0)
entries[i].inner_rect.width = r.width
- entries[i].inner_rect.x - window->frame->right_width;
else
entries[i].inner_rect.width = r.width
- entries[i].inner_rect.x - OUTLINE_WIDTH;
++i; ++i;
tmp = tmp->next; tmp = tmp->next;