← Back to branch summary

~ubuntu-branches/debian/wheezy/gnome-shell/wheezy

« back to all changes in this revision

Viewing changes to js/ui/chrome.js

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Emilio Pozuelo Monfort
  • Date: 2010-04-27 22:32:21 UTC
  • mfrom: (17.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100427223221-21af7bf7ed9mvrkj
Tags: 2.29.0-3
[ Emilio Pozuelo Monfort ]
* debian/patches/02_gjs_build_fix.patch:
  - Backport upstream commit to fix the build with recent gjs.
* debian/source/format,
  debian/patches/series,
  debian/rules:
  - Convert to source format 3.0 (quilt).
* debian/rules:
  - Include gnome-get-source.mk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
js/ui/chrome.js
191
191
 
192
192
    _windowsRestacked: function() {
193
193
        let windows = global.get_windows();
 
194
        let primary = global.get_primary_monitor();
194
195
 
195
196
        // The chrome layer should be visible unless there is a window
196
197
        // with layer FULLSCREEN, or a window with layer
207
208
        this._obscuredByFullscreen = false;
208
209
        for (let i = windows.length - 1; i > -1; i--) {
209
210
            let layer = windows[i].get_meta_window().get_layer();
210
 
 
 
211
            if (layer == Meta.StackLayer.FULLSCREEN) {
 
212
                if (windows[i].x >= primary.x && windows[i].x <= primary.x + primary.width &&
 
213
                    windows[i].y >= primary.y && windows[i].y <= primary.y + primary.height) {
 
214
                        this._obscuredByFullscreen = true;
 
215
                        break;
 
216
                }
 
217
            }
211
218
            if (layer == Meta.StackLayer.OVERRIDE_REDIRECT) {
212
 
                if (windows[i].x <= 0 &&
213
 
                    windows[i].x + windows[i].width >= global.screen_width &&
214
 
                    windows[i].y <= 0 &&
215
 
                    windows[i].y + windows[i].height >= global.screen_height) {
 
219
                if (windows[i].x <= primary.x &&
 
220
                    windows[i].x + windows[i].width >= primary.x + primary.width &&
 
221
                    windows[i].y <= primary.y &&
 
222
                    windows[i].y + windows[i].height >= primary.y + primary.height) {
216
223
                    this._obscuredByFullscreen = true;
217
224
                    break;
218
225
                }
219
 
            } else if (layer == Meta.StackLayer.FULLSCREEN) {
220
 
                this._obscuredByFullscreen = true;
221
 
                break;
222
226
            } else
223
227
                break;
224
228
        }