[gnome-shell] [ShellWindowTracker] Don't skip "uninteresting" windows for focus
- From: Colin Walters <walters src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-shell] [ShellWindowTracker] Don't skip "uninteresting" windows for focus
- Date: Wed, 21 Oct 2009 15:44:13 +0000 (UTC)
commit 7548f2d71e88a998e56e14c7eedcc3232b81aa8b
Author: Colin Walters <walters verbum org>
Date: Wed Oct 21 11:28:07 2009 -0400
[ShellWindowTracker] Don't skip "uninteresting" windows for focus
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
js/ui/panel.js | 2 +-
src/shell-window-tracker.c | 23 ++++++-----------------
2 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 20251b5..447bb85 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -146,7 +146,7 @@ AppPanelMenu.prototype = {
this._iconBox.remove_all();
this._iconBox.hide();
- this._label.text = '';
+ this._label.set_text('');
if (this._focusedApp != null) {
let icon = this._focusedApp.create_icon_texture(PANEL_ICON_SIZE);
this._iconBox.append(icon, Big.BoxPackFlags.NONE);
diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index a311a0f..b0174d0 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -380,22 +380,6 @@ _shell_window_tracker_get_app_context (ShellWindowTracker *tracker, ShellApp *ap
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
on_transient_window_title_changed (MetaWindow *window,
GParamSpec *spec,
@@ -687,13 +671,18 @@ shell_window_tracker_get_running_apps (ShellWindowTracker *monitor,
static gboolean
idle_handle_focus_change (gpointer data)
{
+ MetaScreen *screen;
+ MetaDisplay *display;
ShellWindowTracker *tracker = data;
MetaWindow *new_focus_win;
ShellApp *new_focus_app;
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;
if (new_focus_app == tracker->focus_app)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]