Tag release 40.rc

Update NEWS.

NEWS

@@ -1,3 +1,18 @@
+40.rc
+=====
+* native-window-placement: Adjust to gnome-shell changes [Florian; !164]
+* windows-navigator: Adjust to gnome-shell changes [Florian; !163]
+* window-list, workspace-indicator: Only show previews for up to six workspaces
+  [Florian; !165]
+* window-list, workspace-indicator: Improve workspace preview appearance
+  [Florian; !166]
+
+Contributors:
+  Florian Müllner
+
+Translators:
+  Fran Dieguez [gl]
+
 40.beta
 =======
 * Add tooltips to workspace thumbnails [Florian; !155]

extensions/native-window-placement/extension.js

@@ -3,6 +3,7 @@
 const { Clutter } = imports.gi;
 
 const ExtensionUtils = imports.misc.extensionUtils;
+const Main = imports.ui.main;
 const { WindowPreview } = imports.ui.windowPreview;
 const Workspace = imports.ui.workspace;
 
@@ -66,13 +67,15 @@ class Rect {
 }
 
 class NaturalLayoutStrategy extends Workspace.LayoutStrategy {
-    constructor(settings) {
-        super();
+    constructor(params, settings) {
+        super(params);
         this._settings = settings;
     }
 
-    computeLayout(windows, layout) {
-        layout.windows = windows;
+    computeLayout(windows, _params) {
+        return {
+            windows,
+        };
     }
 
     /*
@@ -246,23 +249,36 @@ function enable() {
     let settings = ExtensionUtils.getSettings();
 
     workspaceInjections['_createBestLayout'] = Workspace.WorkspaceLayout.prototype._createBestLayout;
-    Workspace.WorkspaceLayout.prototype._createBestLayout = function (area) {
-        let strategy = new NaturalLayoutStrategy(settings);
-        let layout = { area, strategy };
-        strategy.computeLayout(this._sortedWindows, layout);
-
-        return layout;
+    Workspace.WorkspaceLayout.prototype._createBestLayout = function (_area) {
+        this._layoutStrategy = new NaturalLayoutStrategy({
+            monitor: Main.layoutManager.monitors[this._monitorIndex],
+        }, settings);
+        return this._layoutStrategy.computeLayout(this._sortedWindows);
     };
 
     // position window titles on top of windows in overlay
     winInjections['_init'] = WindowPreview.prototype._init;
-    WindowPreview.prototype._init = function (metaWindow, workspace) {
-        winInjections['_init'].call(this, metaWindow, workspace);
+    WindowPreview.prototype._init = function (...args) {
+        winInjections['_init'].call(this, ...args);
 
-        const constraint = this._title.get_constraints().find(
+        if (!settings.get_boolean('window-captions-on-top'))
+            return;
+
+        const alignConstraint = this._title.get_constraints().find(
             c => c.align_axis && c.align_axis === Clutter.AlignAxis.Y_AXIS);
-        constraint.factor = settings.get_boolean('window-captions-on-top')
-            ? 0 : 1;
+        alignConstraint.factor = 0;
+
+        const bindConstraint = this._title.get_constraints().find(
+            c => c.coordinate && c.coordinate === Clutter.BindCoordinate.Y);
+        bindConstraint.offset = 0;
+    };
+    winInjections['_adjustOverlayOffsets'] =
+        WindowPreview.prototype._adjustOverlayOffsets;
+    WindowPreview.prototype._adjustOverlayOffsets = function (...args) {
+        winInjections['_adjustOverlayOffsets'].call(this, ...args);
+
+        if (settings.get_boolean('window-captions-on-top'))
+            this._title.translation_y = -this._title.translation_y;
     };
 }
 

extensions/window-list/classic.css

@@ -50,11 +50,12 @@
 
 /* workspace switcher */
 .window-list-workspace-indicator .workspace {
-  background-color: #ddd;
+  border: 2px solid #f6f5f4;
+  background-color: #ccc;
 }
 
 .window-list-workspace-indicator .workspace.active {
-  background-color: #ccc;
+  border-color: #888;
 }
 
 .window-list-window-preview {
@@ -64,5 +65,4 @@
 
 .window-list-window-preview.active {
   background-color: #f6f5f4;
-  border: 2px solid #888;
 }

extensions/window-list/stylesheet.css

@@ -23,7 +23,7 @@
 .window-picker-toggle > StWidget {
   color: #bbb;
   background-color: black;
-  border-radius: 4px;
+  border-radius: 2px;
   padding: 3px 6px 1px;
   box-shadow: inset 1px 1px 4px rgba(255,255,255,0.5);
   text-shadow: 1px 1px 4px rgba(0,0,0,0.8);
@@ -91,37 +91,23 @@
 }
 
 .window-list-workspace-indicator .workspace {
-  border: 1px solid #cccccc;
+  border: 2px solid #000;
   width: 52px;
-}
-
-.window-list-workspace-indicator .workspace:first-child:last-child:ltr,
-.window-list-workspace-indicator .workspace:first-child:last-child:rtl {
   border-radius: 4px;
-}
-
-.window-list-workspace-indicator .workspace:first-child:ltr,
-.window-list-workspace-indicator .workspace:last-child:rtl {
-  border-radius: 4px 0 0 4px;
-}
-
-.window-list-workspace-indicator .workspace:first-child:rtl,
-.window-list-workspace-indicator .workspace:last-child:ltr {
-  border-radius: 0 4px 4px 0;
+  background-color: #595959;
 }
 
 .window-list-workspace-indicator .workspace.active {
-  background-color: rgba(200, 200, 200, .3);
+  border-color: #fff;
 }
 
 .window-list-window-preview {
-  background-color: #252525;
-  border: 1px solid #ccc;
+  background-color: #bebebe;
+  border: 1px solid #828282;
 }
 
 .window-list-window-preview.active {
-  background-color: #353535;
-  border: 2px solid #ccc;
+  background-color: #d4d4d4;
 }
 
 .notification {

extensions/window-list/workspaceIndicator.js

@@ -12,6 +12,8 @@ const _ = Gettext.gettext;
 const TOOLTIP_OFFSET = 6;
 const TOOLTIP_ANIMATION_TIME = 150;
 
+const MAX_THUMBNAILS = 6;
+
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
     _init(window) {
@@ -286,13 +288,13 @@ class WorkspaceIndicator extends PanelMenu.Button {
             workspaceManager.connect_after('workspace-switched',
                 this._onWorkspaceSwitched.bind(this)),
             workspaceManager.connect('notify::layout-rows',
-                this._onWorkspaceOrientationChanged.bind(this)),
+                this._updateThumbnailVisibility.bind(this)),
         ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._updateMenu();
         this._updateThumbnails();
-        this._onWorkspaceOrientationChanged();
+        this._updateThumbnailVisibility();
 
         this._settings = new Gio.Settings({ schema_id: 'org.gnome.desktop.wm.preferences' });
         this._settingsChangedId = this._settings.connect(
@@ -311,12 +313,15 @@ class WorkspaceIndicator extends PanelMenu.Button {
         super._onDestroy();
     }
 
-    _onWorkspaceOrientationChanged() {
-        let vertical = global.workspace_manager.layout_rows === -1;
-        this.reactive = vertical;
+    _updateThumbnailVisibility() {
+        const { workspaceManager } = global;
+        const vertical = workspaceManager.layout_rows === -1;
+        const useMenu =
+            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
+        this.reactive = useMenu;
 
-        this._statusBin.visible = vertical;
-        this._thumbnailsBox.visible = !vertical;
+        this._statusBin.visible = useMenu;
+        this._thumbnailsBox.visible = !useMenu;
     }
 
     _onWorkspaceSwitched() {
@@ -332,6 +337,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _nWorkspacesChanged() {
         this._updateMenu();
         this._updateThumbnails();
+        this._updateThumbnailVisibility();
     }
 
     _updateMenuOrnament() {

extensions/windowsNavigator/extension.js

@@ -3,6 +3,7 @@
 const { Clutter, Graphene, GObject, St } = imports.gi;
 
 const Main = imports.ui.main;
+const OverviewControls = imports.ui.overviewControls;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
@@ -10,10 +11,10 @@ const WINDOW_SLOT = 4;
 
 var MyWorkspace = GObject.registerClass(
 class MyWorkspace extends Workspace.Workspace {
-    _init(metaWorkspace, monitorIndex) {
-        super._init(metaWorkspace, monitorIndex);
+    _init(...args) {
+        super._init(...args);
 
-        if (metaWorkspace && metaWorkspace.index() < 9) {
+        if (this.metaWorkspace && this.metaWorkspace.index() < 9) {
             this._tip = new St.Label({
                 style_class: 'extension-windowsNavigator-window-tooltip',
                 visible: false,
@@ -49,21 +50,24 @@ class MyWorkspace extends Workspace.Workspace {
     }
 
     getWindowWithTooltip(id) {
-        const slot = this.layout_manager._windowSlots[id - 1];
+        const { layoutManager } = this._container;
+        const slot = layoutManager._windowSlots[id - 1];
         return slot ? slot[WINDOW_SLOT].metaWindow : null;
     }
 
     showWindowsTooltips() {
-        for (let i = 0; i < this.layout_manager._windowSlots.length; i++) {
-            if (this.layout_manager._windowSlots[i])
-                this.layout_manager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
+        const { layoutManager } = this._container;
+        for (let i = 0; i < layoutManager._windowSlots.length; i++) {
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].showTooltip(`${i + 1}`);
         }
     }
 
     hideWindowsTooltips() {
-        for (let i in this.layout_manager._windowSlots) {
-            if (this.layout_manager._windowSlots[i])
-                this.layout_manager._windowSlots[i][WINDOW_SLOT].hideTooltip();
+        const { layoutManager } = this._container;
+        for (let i in layoutManager._windowSlots) {
+            if (layoutManager._windowSlots[i])
+                layoutManager._windowSlots[i][WINDOW_SLOT].hideTooltip();
         }
     }
 
@@ -80,17 +84,17 @@ class MyWorkspace extends Workspace.Workspace {
             });
 
             this._text.add_constraint(new Clutter.BindConstraint({
-                source: this._borderCenter,
+                source: this._windowContainer,
                 coordinate: Clutter.BindCoordinate.POSITION,
             }));
             this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this._borderCenter,
+                source: this._windowContainer,
                 align_axis: Clutter.AlignAxis.X_AXIS,
                 pivot_point: new Graphene.Point({ x: 0.5, y: -1 }),
                 factor: this._closeButtonSide === St.Side.LEFT ? 1 : 0,
             }));
             this._text.add_constraint(new Clutter.AlignConstraint({
-                source: this._borderCenter,
+                source: this._windowContainer,
                 align_axis: Clutter.AlignAxis.Y_AXIS,
                 pivot_point: new Graphene.Point({ x: -1, y: 0.5 }),
                 factor: 0,
@@ -115,8 +119,8 @@ class MyWorkspace extends Workspace.Workspace {
 
 var MyWorkspacesView = GObject.registerClass(
 class MyWorkspacesView extends WorkspacesView.WorkspacesView {
-    _init(width, height, x, y, workspaces) {
-        super._init(width, height, x, y, workspaces);
+    _init(...args) {
+        super._init(...args);
 
         this._pickWorkspace = false;
         this._pickWindow = false;
@@ -160,8 +164,8 @@ class MyWorkspacesView extends WorkspacesView.WorkspacesView {
     }
 
     _onKeyPress(s, o) {
-        let { viewSelector } = Main.overview;
-        if (viewSelector._activePage !== viewSelector._workspacesPage)
+        const { ControlsState } = OverviewControls;
+        if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER)
             return false;
 
         let workspaceManager = global.workspace_manager;

extensions/workspace-indicator/extension.js

@@ -18,6 +18,8 @@ const WORKSPACE_KEY = 'workspace-names';
 const TOOLTIP_OFFSET = 6;
 const TOOLTIP_ANIMATION_TIME = 150;
 
+const MAX_THUMBNAILS = 6;
+
 let WindowPreview = GObject.registerClass(
 class WindowPreview extends St.Button {
     _init(window) {
@@ -288,14 +290,14 @@ class WorkspaceIndicator extends PanelMenu.Button {
             workspaceManager.connect_after('workspace-switched',
                 this._onWorkspaceSwitched.bind(this)),
             workspaceManager.connect('notify::layout-rows',
-                this._onWorkspaceOrientationChanged.bind(this)),
+                this._updateThumbnailVisibility.bind(this)),
         ];
 
         this.connect('scroll-event', this._onScrollEvent.bind(this));
         this._thumbnailsBox.connect('scroll-event', this._onScrollEvent.bind(this));
         this._createWorkspacesSection();
         this._updateThumbnails();
-        this._onWorkspaceOrientationChanged();
+        this._updateThumbnailVisibility();
 
         this._settings = new Gio.Settings({ schema_id: WORKSPACE_SCHEMA });
         this._settingsChangedId = this._settings.connect(
@@ -317,16 +319,19 @@ class WorkspaceIndicator extends PanelMenu.Button {
         super._onDestroy();
     }
 
-    _onWorkspaceOrientationChanged() {
-        let vertical = global.workspace_manager.layout_rows === -1;
-        this.reactive = vertical;
+    _updateThumbnailVisibility() {
+        const { workspaceManager } = global;
+        const vertical = workspaceManager.layout_rows === -1;
+        const useMenu =
+            vertical || workspaceManager.n_workspaces > MAX_THUMBNAILS;
+        this.reactive = useMenu;
 
-        this._statusLabel.visible = vertical;
-        this._thumbnailsBox.visible = !vertical;
+        this._statusLabel.visible = useMenu;
+        this._thumbnailsBox.visible = !useMenu;
 
         // Disable offscreen-redirect when showing the workspace switcher
         // so that clip-to-allocation works
-        Main.panel.set_offscreen_redirect(vertical
+        Main.panel.set_offscreen_redirect(useMenu
             ? Clutter.OffscreenRedirect.ALWAYS
             : Clutter.OffscreenRedirect.AUTOMATIC_FOR_OPACITY);
     }
@@ -343,6 +348,7 @@ class WorkspaceIndicator extends PanelMenu.Button {
     _nWorkspacesChanged() {
         this._createWorkspacesSection();
         this._updateThumbnails();
+        this._updateThumbnailVisibility();
     }
 
     _updateMenuOrnament() {

extensions/workspace-indicator/stylesheet.css

@@ -1,40 +1,28 @@
 .panel-workspace-indicator {
-	padding: 0 8px;
+  padding: 0 8px;
 }
 
 .panel-workspace-indicator-box {
-	padding: 2px 0;
+  padding: 4px 0;
+  spacing: 4px;
 }
 
 .panel-workspace-indicator-box .workspace {
-	width: 40px;
+  width: 40px;
+  border: 2px solid #000;
+  border-radius: 2px;
+  background-color: #595959;
 }
 
-.panel-workspace-indicator,
-.panel-workspace-indicator-box .workspace {
-	border: 1px solid #cccccc;
-}
-
-.panel-workspace-indicator,
 .panel-workspace-indicator-box .workspace.active {
-	background-color: rgba(200, 200, 200, .5);
-}
-
-.panel-workspace-indicator-box .workspace {
-    background-color: rgba(200, 200, 200, .3);
-    border-left-width: 0;
-}
-
-.panel-workspace-indicator-box .workspace:first-child {
-    border-left-width: 1px;
+  border-color: #fff;
 }
 
 .workspace-indicator-window-preview {
-    background-color: #252525;
-    border: 1px solid #ccc;
+  background-color: #bebebe;
+  border: 1px solid #828282;
 }
 
 .workspace-indicator-window-preview.active {
-    background-color: #353535;
-    border: 2px solid #ccc;
+  background-color: #d4d4d4;
 }

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '40.beta',
+  version: '40.rc',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )

po/gl.po

@@ -1,29 +1,29 @@
 # Galician translation for gnome-shell-extensions.
 # Copyright (C) 2011 gnome-shell-extensions's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gnome-shell-extensions package.
-# Fran Diéguez <frandieguez@gnome.org>, 2011.
-# Fran Dieguez <frandieguez@gnome.org>, 2011-2020.
 #
+# Fran Diéguez <frandieguez@gnome.org>, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2011-2020, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
-"issues\n"
-"POT-Creation-Date: 2020-05-28 00:55+0000\n"
-"PO-Revision-Date: 2020-08-13 01:02+0200\n"
-"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician <proxecto@trasno.gal>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/is"
+"sues\n"
+"POT-Creation-Date: 2020-10-17 20:14+0000\n"
+"PO-Revision-Date: 2021-02-24 20:41+0100\n"
+"Last-Translator: Fran Diéguez <frandieguez@gnome.org>\n"
+"Language-Team: Proxecto Trasno <proxecto@trasno.gal>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"X-Generator: Gtranslator 3.36.0\n"
+"X-Generator: Gtranslator 3.38.0\n"
 "X-Project-Style: gnome\n"
 
-#: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
+#: data/gnome-classic.desktop.in:3
 msgid "GNOME Classic"
-msgstr "GNOME clasico"
+msgstr "GNOME clásico"
 
 #: data/gnome-classic.desktop.in:4
 msgid "This session logs you into GNOME Classic"
@@ -50,7 +50,6 @@ msgstr ""
 "de ficheiro desktop), seguido por unha coma e o número do espazo de traballo"
 
 #: extensions/auto-move-windows/prefs.js:35
-#| msgid "Workspace Names"
 msgid "Workspace Rules"
 msgstr "Regras da área de traballo"
 
@@ -75,7 +74,7 @@ msgstr "Abrir ficheiros"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:5
 msgid "Use more screen for windows"
-msgstr "Usar máis pantalla para as xanelas"
+msgstr "Usar mais pantalla para as xanelas"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:6
 msgid ""
@@ -83,13 +82,14 @@ msgid ""
 "aspect ratio, and consolidating them further to reduce the bounding box. "
 "This setting applies only with the natural placement strategy."
 msgstr ""
-"Tente usar máis pantalla para dispor as miniaturas das xanelas adaptándose á "
-"taxa de aspecto da pantalla e consolidalas para reducir a caixa saltante. "
-"Esta configuración aplícase só para a estratexia de disposición natural."
+"Tente usar mais pantalla para dispor as miniaturas das xanelas adaptándose"
+" á "
+"taxa de aspecto da pantalla e consolidalas para reducir a caixa envolvente. "
+"Esta configuración aplícase só para a estratexia de disposición natural."
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:11
 msgid "Place window captions on top"
-msgstr "Pór a xanela sempre na parte superior"
+msgstr "Por a xanela sempre na parte superior"
 
 #: extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml:12
 msgid ""
@@ -165,27 +165,27 @@ msgstr "Restaurar"
 msgid "Maximize"
 msgstr "Maximizar"
 
-#: extensions/window-list/extension.js:428
+#: extensions/window-list/extension.js:432
 msgid "Minimize all"
 msgstr "Minimizar todo"
 
-#: extensions/window-list/extension.js:434
+#: extensions/window-list/extension.js:438
 msgid "Unminimize all"
 msgstr "Restaurar todo"
 
-#: extensions/window-list/extension.js:440
+#: extensions/window-list/extension.js:444
 msgid "Maximize all"
 msgstr "Maximizar todo"
 
-#: extensions/window-list/extension.js:448
+#: extensions/window-list/extension.js:452
 msgid "Unmaximize all"
 msgstr "Restaurar todo"
 
-#: extensions/window-list/extension.js:456
+#: extensions/window-list/extension.js:460
 msgid "Close all"
 msgstr "Pechar todo"
 
-#: extensions/window-list/extension.js:734
+#: extensions/window-list/extension.js:738
 msgid "Window List"
 msgstr "Lista de xanelas"
 
@@ -259,7 +259,6 @@ msgid "Workspace %d"
 msgstr "Espazos de traballo %d"
 
 #: extensions/workspace-indicator/prefs.js:218
-#| msgid "Workspace"
 msgid "Add Workspace"
 msgstr "Engadir área de traballo"