From 9702903343c7b67e8e3b4dbf1bf0ff491397b8f1 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 24 Oct 2002 05:21:51 +0000 Subject: [PATCH] make public 2002-10-24 Havoc Pennington * src/window.c (meta_window_get_icon_geometry): make public * src/screen.c (meta_screen_ensure_tab_popup): put the alt+tab highlight-window indicator on the icon, not the window itself, if the window is minimized. --- ChangeLog | 8 ++++++++ src/screen.c | 5 ++++- src/window.c | 5 +---- src/window.h | 3 +++ 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c8ab4b344..f003080b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-10-24 Havoc Pennington + + * src/window.c (meta_window_get_icon_geometry): make public + + * src/screen.c (meta_screen_ensure_tab_popup): put the alt+tab + highlight-window indicator on the icon, not the window itself, + if the window is minimized. + 2002-10-24 Havoc Pennington * src/display.c (meta_display_get_tab_list): put minimized windows diff --git a/src/screen.c b/src/screen.c index c41390348..e9dade24b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1005,7 +1005,10 @@ meta_screen_ensure_tab_popup (MetaScreen *screen, entries[i].key = (MetaTabEntryKey) window->xwindow; entries[i].title = window->title; entries[i].icon = window->icon; - meta_window_get_outer_rect (window, &r); + + if (!window->minimized || !meta_window_get_icon_geometry (window, &r)) + meta_window_get_outer_rect (window, &r); + entries[i].x = r.x; entries[i].y = r.y; entries[i].width = r.width; diff --git a/src/window.c b/src/window.c index 8466690ed..666aa792e 100644 --- a/src/window.c +++ b/src/window.c @@ -102,9 +102,6 @@ static void meta_window_hide (MetaWindow *window); static GList* meta_window_get_workspaces (MetaWindow *window); -static gboolean meta_window_get_icon_geometry (MetaWindow *window, - MetaRectangle *rect); - static void meta_window_save_rect (MetaWindow *window); static void adjust_for_gravity (MetaWindow *window, @@ -4499,7 +4496,7 @@ update_mwm_hints (MetaWindow *window) recalc_window_features (window); } -static gboolean +gboolean meta_window_get_icon_geometry (MetaWindow *window, MetaRectangle *rect) { diff --git a/src/window.h b/src/window.h index fd69bbdc7..03e25dce0 100644 --- a/src/window.h +++ b/src/window.h @@ -430,4 +430,7 @@ void meta_window_update_resize_grab_op (MetaWindow *window, void meta_window_update_layer (MetaWindow *window); +gboolean meta_window_get_icon_geometry (MetaWindow *window, + MetaRectangle *rect); + #endif