Merge pull request #97 from mzur/3.36_compatibility

Fix overview compatibility with GNOME 3.36 (fixes #96)

Author: mzur

[email protected]/BaseWorkspaceSwitcherPopup.js

@@ -1,6 +1,5 @@
 const { GLib, GObject} = imports.gi;
 const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup.WorkspaceSwitcherPopup;
-const Mainloop = imports.mainloop;
 
 var BaseWorkspaceSwitcherPopup = GObject.registerClass(
 class BaseWorkspaceSwitcherPopup extends WorkspaceSwitcherPopup {
@@ -13,12 +12,12 @@ class BaseWorkspaceSwitcherPopup extends WorkspaceSwitcherPopup {
       super.display(direction, activeWorkspaceIndex);
 
       if (this._timeoutId !== 0) {
-         Mainloop.source_remove(this._timeoutId);
+         GLib.source_remove(this._timeoutId);
          this._timeoutId = 0;
       }
 
       if (this._popupTimeout > 0) {
-         this._timeoutId = Mainloop.timeout_add(this._popupTimeout, this._onTimeout.bind(this));
+         this._timeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, this._popupTimeout, this._onTimeout.bind(this));
          GLib.Source.set_name_by_id(this._timeoutId, '[gnome-shell] this._onTimeout');
       }
    }

[email protected]/IndicatorWsmatrixPopup.js

@@ -19,8 +19,7 @@ class IndicatorWsmatrixPopupList extends WorkspaceSwitcherPopupList {
       let workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitorIndex);
       let themeNode = this.get_theme_node();
 
-      let availHeight = workArea.height;
-      availHeight -= themeNode.get_vertical_padding();
+      let availHeight = workArea.height - themeNode.get_vertical_padding();
 
       let height = 0;
       let [, childNaturalHeight] = children[0].get_preferred_height(-1);
@@ -45,8 +44,7 @@ class IndicatorWsmatrixPopupList extends WorkspaceSwitcherPopupList {
       let workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitorIndex);
       let themeNode = this.get_theme_node();
 
-      let availWidth = workArea.width;
-      availWidth -= themeNode.get_horizontal_padding();
+      let availWidth = workArea.width - themeNode.get_horizontal_padding();
 
       let width = Math.round(this._childHeight * workArea.width / workArea.height) * this._columns;
 
@@ -56,7 +54,7 @@ class IndicatorWsmatrixPopupList extends WorkspaceSwitcherPopupList {
 
       this._childWidth = (width - spacing) / this._columns;
 
-      return themeNode.adjust_preferred_width(width, width);
+      return [width, width];
    }
 
    vfunc_allocate(box, flags) {
@@ -113,20 +111,13 @@ class IndicatorWsmatrixPopup extends BaseWorkspaceSwitcherPopup {
       this._container.x = workArea.x + Math.floor((workArea.width - containerNatWidth) / 2);
       this._container.y = workArea.y + Math.floor((workArea.height - containerNatHeight) / 2);
 
-      let indicators = this._list.get_children();
-      for (let i = 0; i < indicators.length; i++) {
-         if (this.showWorkspaceNames) {
-            let workspaceName = Meta.prefs_get_workspace_name(i);
-            indicators[i].child = new St.Label({
-               text: workspaceName,
+      if (this.showWorkspaceNames) {
+         this._list.get_children().forEach(function (indicator, index) {
+            indicator.child = new St.Label({
+               text: Meta.prefs_get_workspace_name(index),
                style_class: "ws-switcher-label"
             });
-         }
-         if (i === this._activeWorkspaceIndex && (this._direction == Meta.MotionDirection.UP || this._direction == Meta.MotionDirection.LEFT)) {
-            indicators[i].style_class = 'wsmatrix ws-switcher-active-up';
-         } else if (i === this._activeWorkspaceIndex) {
-            indicators[i].style_class = 'wsmatrix ws-switcher-active-down';
-         }
+         });
       }
    }
 });

[email protected]/OverviewOverride.js

@@ -75,9 +75,9 @@ var OverviewOverride = class {
 
    _activateOverride() {
       this._overrideActive = true;
-      let workspacesDisplay = Main.overview._controls.viewSelector._workspacesDisplay;
+      let workspacesDisplay = Main.overview._overview._controls.viewSelector._workspacesDisplay;
       this._workspacesDisplayOverride = new WorkspacesDisplayOverride(workspacesDisplay);
-      let thumbnailsBox = Main.overview._controls._thumbnailsBox;
+      let thumbnailsBox = Main.overview._overview._controls._thumbnailsBox;
       this._thumbnailsBoxOverride = new ThumbnailsBoxOverride(thumbnailsBox, this.rows, this.columns);
       this._workspacesViewOverride = new WorkspacesViewOverride(this.settings);
    }

[email protected]/ThumbnailWsmatrixPopup.js

@@ -21,17 +21,17 @@ class ThumbnailWsmatrixPopupList extends WorkspaceSwitcherPopupList {
       let children = this.get_children();
       let workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitorIndex);
       let themeNode = this.get_theme_node();
+      let spacing = themeNode.get_length('spacing');
 
-      let availHeight = workArea.height;
-      availHeight -= themeNode.get_vertical_padding();
+      let availHeight = workArea.height - themeNode.get_vertical_padding();
 
       let height = this._rows * this._scale * children[0].get_height();
-      let spacing = this._itemSpacing * (this._rows - 1);
+      let totalSpacing = spacing * (this._rows - 1);
 
-      height += spacing;
+      height += totalSpacing;
       height = Math.round(Math.min(height, availHeight));
 
-      this._childHeight = Math.round((height - spacing) / this._rows);
+      this._childHeight = Math.round((height - totalSpacing) / this._rows);
 
       return themeNode.adjust_preferred_height(height, height);
    }
@@ -40,37 +40,44 @@ class ThumbnailWsmatrixPopupList extends WorkspaceSwitcherPopupList {
       let children = this.get_children();
       let workArea = Main.layoutManager.getWorkAreaForMonitor(this._monitorIndex);
       let themeNode = this.get_theme_node();
+      let spacing = themeNode.get_length('spacing');
 
-      let availWidth = workArea.width;
-      availWidth -= themeNode.get_horizontal_padding();
+      let availWidth = workArea.width - themeNode.get_horizontal_padding();
 
       let width = this._columns * this._scale * children[0].get_width();
-      let spacing = this._itemSpacing * (this._columns - 1);
+      let totalSpacing = spacing * (this._columns - 1);
 
-      width += spacing;
+      width += totalSpacing;
       width = Math.round(Math.min(width, availWidth));
 
-      this._childWidth = Math.round((width - spacing) / this._columns);
+      this._childWidth = Math.round((width - totalSpacing) / this._columns);
 
-      return themeNode.adjust_preferred_height(width, width);
+      return [width, width];
    }
 
    vfunc_allocate(box, flags) {
       this.set_allocation(box, flags);
 
       let themeNode = this.get_theme_node();
       box = themeNode.get_content_box(box);
+      let spacing = themeNode.get_length('spacing');
 
       let children = this.get_children();
       let childBox = new Clutter.ActorBox();
 
       let row = 0;
       let column = 0;
-      let itemWidth = this._childWidth + this._itemSpacing;
-      let itemHeight = this._childHeight + this._itemSpacing;
-      let indicatorOffset = Math.round(this._itemSpacing / 2);
+      let itemWidth = this._childWidth + spacing;
+      let itemHeight = this._childHeight + spacing;
       let indicator = children.pop();
 
+      let indicatorThemeNode = indicator.get_theme_node();
+
+      let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP);
+      let indicatorBottomFullBorder = indicatorThemeNode.get_padding(St.Side.BOTTOM) + indicatorThemeNode.get_border_width(St.Side.BOTTOM);
+      let indicatorLeftFullBorder = indicatorThemeNode.get_padding(St.Side.LEFT) + indicatorThemeNode.get_border_width(St.Side.LEFT);
+      let indicatorRightFullBorder = indicatorThemeNode.get_padding(St.Side.RIGHT) + indicatorThemeNode.get_border_width(St.Side.RIGHT);
+
       for (let i = 0; i < children.length; i++) {
          row = Math.floor(i / this._columns);
          column = i % this._columns;
@@ -82,10 +89,10 @@ class ThumbnailWsmatrixPopupList extends WorkspaceSwitcherPopupList {
          children[i].allocate(childBox, flags);
 
          if (i === this._activeWorkspaceIndex) {
-            childBox.x1 -= indicatorOffset;
-            childBox.x2 = childBox.x1 + this._childWidth + indicatorOffset * 2;
-            childBox.y1 -= indicatorOffset;
-            childBox.y2 = childBox.y1 + this._childHeight + indicatorOffset * 2;
+            childBox.x2 = childBox.x1 + this._childWidth + indicatorRightFullBorder;
+            childBox.x1 -= indicatorLeftFullBorder;
+            childBox.y2 = childBox.y1 + this._childHeight + indicatorBottomFullBorder;
+            childBox.y1 -= indicatorTopFullBorder;
             indicator.allocate(childBox, flags);
          }
       }

[email protected]/ThumbnailsBoxOverride.js

@@ -14,7 +14,6 @@ var ThumbnailsBoxOverride = class {
       this.thumbnailsBox = thumbnailsBox;
       this.overrideProperties = [
          '_activateThumbnailAtPoint',
-         '_activeWorkspaceChanged',
          'allocate',
          'handleDragOver',
          'get_preferred_height',
@@ -87,7 +86,7 @@ var ThumbnailsBoxOverride = class {
    // Overriding the switch to workspace method
    // triggered on clicking a workspace thumbnail in the thumbnailbox of the overview
    _activateThumbnailAtPoint(stageX, stageY, time) {
-      let [r, x, y] = this.transform_stage_point(stageX, stageY);
+      let [, x, y] = this.transform_stage_point(stageX, stageY);
 
       let thumbnail = this._thumbnails.find(t => {
          let [w, h] = t.get_transformed_size();
@@ -99,31 +98,6 @@ var ThumbnailsBoxOverride = class {
       }
    }
 
-   // Overriding the Tweener animation to consider both vertical and horizontal changes
-   // the original method only animates vertically
-   _activeWorkspaceChanged(wm, from, to, direction) {
-      let workspaceManager = global.workspace_manager;
-      let activeWorkspace = workspaceManager.get_active_workspace();
-      let thumbnail = this._thumbnails.find(t => t.metaWorkspace == activeWorkspace);
-      let [thumbX, thumbY] = thumbnail.get_position();
-
-      this._animatingIndicator = true;
-
-      //todo: this code should animate x & y, but for some reason it is not
-      this._indicator.ease({
-         thumbX,
-         thumbY,
-         duration: WorkspacesView.WORKSPACE_SWITCH_TIME,
-         mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-         onComplete: () => {
-            this._animatingIndicator = false;
-            this.indicator_x = thumbX;
-            this.indicator_y = thumbY;
-            this._queueUpdateStates();
-         }
-      });
-   }
-
    // It is helpful to be able to control the height
    // however, this method is not being called for some reason
    get_preferred_height(forWidth) {
@@ -147,8 +121,8 @@ var ThumbnailsBoxOverride = class {
       let totalSpacingX = (this.getColumns() - 1) * spacing;
       let totalSpacingY = (this.getRows() - 1) * spacing;
 
-      let availY = forHeight - totalSpacingY;
-      let scale = availY < 0 ? MAX_THUMBNAIL_SCALE : (availY / this.getRows()) / this._porthole.height;
+      let availY = Math.max(0, forHeight - totalSpacingY);
+      let scale = (availY / this.getRows()) / this._porthole.height;
       scale = Math.min(scale, MAX_THUMBNAIL_SCALE);
 
       let width = Math.round(totalSpacingX + this.getColumns() * this._porthole.width * scale);
@@ -168,7 +142,7 @@ var ThumbnailsBoxOverride = class {
    allocate(box, flags) {
       this._overrideProperties.allocate(box, flags);
 
-      let rtl = (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL);
+      let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL;
 
       if (this._thumbnails.length == 0) // not visible
          return;
@@ -315,30 +289,33 @@ var ThumbnailsBoxOverride = class {
 
    // Handle dragging a window into a workspace
    handleDragOver(source, actor, x, y, time) {
-      if (!source.realWindow && !source.shellWorkspaceLaunch && source != Main.xdndHandler)
+      if (!source.realWindow &&
+         (!source.app || !source.app.can_open_new_window()) &&
+         (source.app || !source.shellWorkspaceLaunch) &&
+         source != Main.xdndHandler)
          return DND.DragMotionResult.CONTINUE;
 
       let canCreateWorkspaces = Meta.prefs_get_dynamic_workspaces();
       let spacing = this.get_theme_node().get_length('spacing');
 
       this._dropWorkspace = -1;
       let placeholderPos = -1;
-      let targetBaseY;
+      let targetBase;
       if (this._dropPlaceholderPos == 0)
-         targetBaseY = this._dropPlaceholder.y;
+         targetBase = this._dropPlaceholder.y;
       else
-         targetBaseY = this._thumbnails[0].y;
-      let targetTop = targetBaseY - spacing - WorkspaceThumbnail.WORKSPACE_CUT_SIZE;
+         targetBase = this._thumbnails[0].y;
+      let targetTop = targetBase - spacing - WorkspaceThumbnail.WORKSPACE_CUT_SIZE;
 
       let length = this._thumbnails.length;
       for (let i = 0; i < length; i++) {
          // Allow the reorder target to have a 10px "cut" into
          // each side of the thumbnail, to make dragging onto the
          // placeholder easier
          let [w, h] = this._thumbnails[i].get_transformed_size();
-         let targetBottom = targetBaseY + WorkspaceThumbnail.WORKSPACE_CUT_SIZE;
-         let nextTargetBaseY = targetBaseY + h + spacing;
-         let nextTargetTop = nextTargetBaseY - spacing - ((i == length - 1) ? 0 : WorkspaceThumbnail.WORKSPACE_CUT_SIZE);
+         let targetBottom = targetBase + WorkspaceThumbnail.WORKSPACE_CUT_SIZE;
+         let nextTargetBase = targetBase + h + spacing;
+         let nextTargetTop = nextTargetBase - spacing - ((i == length - 1) ? 0 : WorkspaceThumbnail.WORKSPACE_CUT_SIZE);
 
          // Expand the target to include the placeholder, if it exists.
          if (i == this._dropPlaceholderPos)
@@ -354,7 +331,7 @@ var ThumbnailsBoxOverride = class {
             break
          }
 
-         targetBaseY = nextTargetBaseY;
+         targetBase = nextTargetBase;
          targetTop = nextTargetTop;
       }
 
@@ -364,7 +341,7 @@ var ThumbnailsBoxOverride = class {
       }
 
       if (this._dropWorkspace != -1)
-         return this._thumbnails[this._dropWorkspace].handleDragOverInternal(source, time);
+         return this._thumbnails[this._dropWorkspace].handleDragOverInternal(source, actor, time);
       else if (this._dropPlaceholderPos != -1)
          return source.realWindow ? DND.DragMotionResult.MOVE_DROP : DND.DragMotionResult.COPY_DROP;
       else

[email protected]/WmOverride.js

@@ -44,10 +44,10 @@ var WmOverride = class {
 
    destroy() {
       this._destroyWorkspaceSwitcherPopup();
-      this._disconnectSettings();
-      this._restoreKeybindingHandlers();
       this._restoreLayout();
+      this._restoreKeybindingHandlers();
       this._restoreDynamicWorkspaces();
+      this._disconnectSettings();
       this._notify();
       this._removeKeybindings();
       this._disconnectOverview();
@@ -254,8 +254,8 @@ var WmOverride = class {
    _restoreLayout() {
       this.wsManager.override_workspace_layout(
          DisplayWrapper.getDisplayCorner().TOPLEFT, // workspace 0
-         true, // true == lay out in columns. false == lay out in rows
-         this.rows * this.columns,
+         false, // true == lay out in columns. false == lay out in rows
+         -1,
          1
       );
    }