From 7b0526dc5c6c11924f0598ecb8143ca8381f7789 Mon Sep 17 00:00:00 2001 From: Florian Scandella Date: Sun, 29 Nov 2009 14:27:56 +0100 Subject: [PATCH] [chrome] only hide chrome if fullscreen window is on the same monitor https://bugzilla.gnome.org/show_bug.cgi?id=599926 --- js/ui/chrome.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/js/ui/chrome.js b/js/ui/chrome.js index daa4c4dd1..2e57456cf 100644 --- a/js/ui/chrome.js +++ b/js/ui/chrome.js @@ -191,6 +191,7 @@ Chrome.prototype = { _windowsRestacked: function() { let windows = global.get_windows(); + let primary = global.get_primary_monitor(); // The chrome layer should be visible unless there is a window // with layer FULLSCREEN, or a window with layer @@ -208,17 +209,15 @@ Chrome.prototype = { for (let i = windows.length - 1; i > -1; i--) { let layer = windows[i].get_meta_window().get_layer(); - if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) { - if (windows[i].x <= 0 && - windows[i].x + windows[i].width >= global.screen_width && - windows[i].y <= 0 && - windows[i].y + windows[i].height >= global.screen_height) { + if (layer == Meta.StackLayer.OVERRIDE_REDIRECT || + layer == Meta.StackLayer.FULLSCREEN) { + if (windows[i].x <= primary.x && + windows[i].x + windows[i].width >= primary.x + primary.width && + windows[i].y <= primary.y && + windows[i].y + windows[i].height >= primary.y + primary.height) { this._obscuredByFullscreen = true; break; } - } else if (layer == Meta.StackLayer.FULLSCREEN) { - this._obscuredByFullscreen = true; - break; } else break; }