brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ShellWindowTracker] Don't skip "uninteresting" windows for focus

Browse Source 
For the purposes of determining which application is focused, don't
skip "uninteresting" windows.  The old get_focused_window code
was used for usage tracking, but here we want reliable application
association.

Also convert a .text= to .set_text that was missed with the last
patch.

https://bugzilla.gnome.org/show_bug.cgi?id=599206
This commit is contained in:
Colin Walters 2009-10-21 11:28:07 -04:00
parent bda7d3994b
commit 7548f2d71e
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/ui/panel.js
View File

@ -146,7 +146,7 @@ AppPanelMenu.prototype = {
this._iconBox.remove_all(); this._iconBox.remove_all();
this._iconBox.hide(); this._iconBox.hide();
this._label.text = ''; this._label.set_text('');
if (this._focusedApp != null) { if (this._focusedApp != null) {
let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE); let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE);
this._iconBox.append(icon, Big.BoxPackFlags.NONE); this._iconBox.append(icon, Big.BoxPackFlags.NONE);

23
src/shell-window-tracker.c
View File

@ -380,22 +380,6 @@ _shell_window_tracker_get_app_context (ShellWindowTracker *tracker, ShellApp *ap
return ""; return "";
} }
static MetaWindow *
get_active_window (ShellWindowTracker *monitor)
{
MetaScreen *screen;
MetaDisplay *display;
MetaWindow *window;
screen = shell_global_get_screen (shell_global_get ());
display = meta_screen_get_display (screen);
window = meta_display_get_focus_window (display);
if (window != NULL && shell_window_tracker_is_window_interesting (window))
return window;
return NULL;
}
static void static void
on_transient_window_title_changed (MetaWindow *window, on_transient_window_title_changed (MetaWindow *window,
GParamSpec *spec, GParamSpec *spec,
@ -687,13 +671,18 @@ shell_window_tracker_get_running_apps (ShellWindowTracker *monitor,
static gboolean static gboolean
idle_handle_focus_change (gpointer data) idle_handle_focus_change (gpointer data)
{ {
MetaScreen *screen;
MetaDisplay *display;
ShellWindowTracker *tracker = data; ShellWindowTracker *tracker = data;
MetaWindow *new_focus_win; MetaWindow *new_focus_win;
ShellApp *new_focus_app; ShellApp *new_focus_app;
tracker->idle_focus_change_id = 0; tracker->idle_focus_change_id = 0;
new_focus_win = get_active_window (tracker); screen = shell_global_get_screen (shell_global_get ());
display = meta_screen_get_display (screen);
new_focus_win = meta_display_get_focus_window (display);
new_focus_app = new_focus_win ? g_hash_table_lookup (tracker->window_to_app, new_focus_win) : NULL; new_focus_app = new_focus_win ? g_hash_table_lookup (tracker->window_to_app, new_focus_win) : NULL;
if (new_focus_app == tracker->focus_app) if (new_focus_app == tracker->focus_app)