Merge pull request #107 from alex4401/master

Fix compatibility with GNOME3.34
dsheeler · Sep 24, 2019 · bcdcda0 · bcdcda0
2 parents 6591fc0 + 699d7c4
commit bcdcda0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/[email protected]/coverflowSwitcher.js b/[email protected]/coverflowSwitcher.js
@@ -72,7 +72,13 @@ Switcher.prototype = {
             let compositor = this._windows[i].get_compositor_private();
             if (compositor) {
                 let texture = compositor.get_texture();
-                let [width, height] = texture.get_size();
+                let width, height
+                if (texture.get_size) {
+                    [width, height] = texture.get_size()
+                } else {
+                    let preferred_size_ok
+                    [preferred_size_ok, width, height] = texture.get_preferred_size();
+                }
 
                 let scale = 1.0;
                 let previewWidth = monitor.width * PREVIEW_SCALE;
@@ -82,7 +88,7 @@ Switcher.prototype = {
 
                 let clone = new Clutter.Clone({
                     opacity: (!metaWin.minimized && metaWin.get_workspace() == currentWorkspace || metaWin.is_on_all_workspaces()) ? 255 : 0,
-                    source: texture,
+                    source: texture.get_size ? texture : compositor,
                     reactive: true,
                     anchor_gravity: Clutter.Gravity.CENTER,
                     x: ((metaWin.minimized) ? 0 : compositor.x + compositor.width / 2) - monitor.x,

diff --git a/[email protected]/timelineSwitcher.js b/[email protected]/timelineSwitcher.js
@@ -60,7 +60,13 @@ Switcher.prototype = {
             let compositor = this._windows[i].get_compositor_private();
             if (compositor) {
                 let texture = compositor.get_texture();
-                let [width, height] = texture.get_size();
+                let width, height
+                if (texture.get_size) {
+                    [width, height] = texture.get_size()
+                } else {
+                    let preferred_size_ok
+                    [preferred_size_ok, width, height] = texture.get_preferred_size();
+                }
 
                 let scale = 1.0;
                 let previewWidth = monitor.width * PREVIEW_SCALE;
@@ -70,7 +76,7 @@ Switcher.prototype = {
 
                 let clone = new Clutter.Clone({
                     opacity: (!metaWin.minimized && metaWin.get_workspace() == currentWorkspace || metaWin.is_on_all_workspaces()) ? 255 : 0,
-                    source: texture,
+                    source: texture.get_size ? texture : compositor,
                     reactive: true,
                     anchor_gravity: Clutter.Gravity.WEST,
                     rotation_angle_y: 12,