From d2c45f428f7dfc5b78ec07b7e16e40f700230f6f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 14 Jan 2013 12:38:02 -0500 Subject: [PATCH] workspace, workspaceThumbnail: Fix another bad rebase It seems I pushed an old version of the patch by accident. --- js/ui/workspace.js | 4 ++-- js/ui/workspaceThumbnail.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 8342b1883..abc0cb440 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -1531,11 +1531,11 @@ const Workspace = new Lang.Class({ this.leavingOverview = false; }, - // Tests if @win belongs to this workspaces and monitor + // Tests if @actor belongs to this workspaces and monitor _isMyWindow : function (actor) { let win = actor.meta_window; return (this.metaWorkspace == null || win.located_on_workspace(this.metaWorkspace)) && - (!win.get_monitor() == this.monitorIndex); + (win.get_monitor() == this.monitorIndex); }, // Tests if @win should be shown in the Overview diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index 03d1fc002..987c886ff 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -380,11 +380,11 @@ const WorkspaceThumbnail = new Lang.Class({ this.actor = null; }, - // Tests if @win belongs to this workspace and monitor + // Tests if @actor belongs to this workspace and monitor _isMyWindow : function (actor) { let win = actor.meta_window; return win.located_on_workspace(this.metaWorkspace) && - (!win.get_monitor() == this.monitorIndex); + (win.get_monitor() == this.monitorIndex); }, // Tests if @win should be shown in the Overview