Bump version to 3.30.2

Update NEWS.

NEWS

@@ -1,3 +1,24 @@
+3.30.2
+======
+* popupMenu: Fix keyboard activation when numlock is active [Andrea; #550]
+* Do not block all shortcuts while app folders are expanded [Florian; #648]
+* Fix regression in handling new input sources [Carlos; #691]
+* Improve performance of app icon animations [Daniel; !253, !261]
+* Respect natural-scroll setting for workspace swipe gesture [Erik; #516]
+* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
+* Confine window preview titles to workspace area [Florian; !214]
+* Misc. bug fixes [Florian, Cosimo; #602, #693, #768, #430, !286]
+
+Contributors:
+  Andrea Azzarone, Cosimo Cecchi, Erik Duxstad, Carlos Garnacho,
+  Florian Müllner, Didier Roche, Marco Trevisan (Treviño), verdre,
+  Daniel van Vugt
+
+Translators:
+  Rūdolfs Mazurs [lv], Kristjan SCHMIDT [eo], Milo Casagrande [it],
+  Dušan Kazik [sk], gogo [hr], Anish Sheela [ml], Rafael Fontenelle [pt_BR],
+  Daniel Mustieles [es]
+
 3.30.1
 ======
 * Cancel search on overview hiding [Marco; !205]

js/misc/keyboardManager.js

@@ -52,11 +52,20 @@ var KeyboardManager = new Lang.Class({
         this._current = null;
         this._localeLayoutInfo = this._getLocaleLayout();
         this._layoutInfos = {};
+        this._currentKeymap = null;
     },
 
     _applyLayoutGroup(group) {
         let options = this._buildOptionsString();
         let [layouts, variants] = this._buildGroupStrings(group);
+
+        if (this._currentKeymap &&
+            this._currentKeymap.layouts == layouts &&
+            this._currentKeymap.variants == variants &&
+            this._currentKeymap.options == options)
+            return;
+
+        this._currentKeymap = {layouts, variants, options};
         Meta.get_backend().set_keymap(layouts, variants, options);
     },
 
@@ -89,8 +98,6 @@ var KeyboardManager = new Lang.Class({
     },
 
     setUserLayouts(ids) {
-        let currentId = this._current ? this._current.id : null;
-        let currentGroupIndex = this._current ? this._current.groupIndex : null;
         this._current = null;
         this._layoutInfos = {};
 
@@ -117,9 +124,6 @@ var KeyboardManager = new Lang.Class({
             info.group = group;
             info.groupIndex = groupIndex;
 
-            if (currentId == id && currentGroupIndex == groupIndex)
-                this._current = info;
-
             i += 1;
         }
     },

js/portal-resources.gresource.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/shell">
+    <file>portalHelper/main.js</file>
+
     <file>misc/config.js</file>
     <file>misc/fileUtils.js</file>
-    <file>portalHelper/main.js</file>
+    <file>misc/params.js</file>
   </gresource>
 </gresources>

js/ui/appDisplay.js

@@ -1462,7 +1462,9 @@ var AppFolderPopup = new Lang.Class({
         global.focus_manager.add_group(this.actor);
 
         source.actor.connect('destroy', () => { this.actor.destroy(); });
-        this._grabHelper = new GrabHelper.GrabHelper(this.actor);
+        this._grabHelper = new GrabHelper.GrabHelper(this.actor, {
+            actionMode: Shell.ActionMode.POPUP
+        });
         this._grabHelper.addActor(Main.layoutManager.overviewGroup);
         this.actor.connect('key-press-event', this._onKeyPress.bind(this));
     },

js/ui/iconGrid.js

@@ -418,6 +418,11 @@ var IconGrid = new Lang.Class({
     },
 
     _animationDone() {
+        this._clonesAnimating.forEach(clone => {
+            clone.source.reactive = true;
+            clone.source.opacity = 255;
+            clone.destroy();
+        });
         this._clonesAnimating = [];
         this.emit('animation-done');
     },
@@ -443,7 +448,6 @@ var IconGrid = new Lang.Class({
 
         for (let index = 0; index < actors.length; index++) {
             let actor = actors[index];
-            actor.reactive = false;
             actor.set_scale(0, 0);
             actor.set_pivot_point(0.5, 0.5);
 
@@ -465,7 +469,6 @@ var IconGrid = new Lang.Class({
                                                      onComplete: () => {
                                                         if (isLastItem)
                                                             this._animationDone();
-                                                        actor.reactive = true;
                                                     }
                                                    });
                               }
@@ -538,10 +541,6 @@ var IconGrid = new Lang.Class({
                                    onComplete: () => {
                                        if (isLastItem)
                                            this._animationDone();
-
-                                       actor.opacity = 255;
-                                       actor.reactive = true;
-                                       actorClone.destroy();
                                    }};
                 fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                                transition: 'easeInOutQuad',
@@ -562,12 +561,8 @@ var IconGrid = new Lang.Class({
                                    scale_x: scaleX,
                                    scale_y: scaleY,
                                    onComplete: () => {
-                                       if (isLastItem) {
+                                       if (isLastItem)
                                            this._animationDone();
-                                           this._restoreItemsOpacity();
-                                       }
-                                       actor.reactive = true;
-                                       actorClone.destroy();
                                    }};
                 fadeParams = { time: ANIMATION_FADE_IN_TIME_FOR_ITEM,
                                transition: 'easeInOutQuad',
@@ -581,12 +576,6 @@ var IconGrid = new Lang.Class({
         }
     },
 
-    _restoreItemsOpacity() {
-        for (let index = 0; index < this._items.length; index++) {
-            this._items[index].actor.opacity = 255;
-        }
-    },
-
     _getAllocatedChildSizeAndSpacing(child) {
         let [,, natWidth, natHeight] = child.get_preferred_size();
         let width = Math.min(this._getHItemSize(), natWidth);

js/ui/messageTray.js

@@ -1309,8 +1309,10 @@ var MessageTray = new Lang.Class({
         }
 
         this._banner = this._notification.createBanner();
-        this._bannerClickedId = this._banner.connect('done-displaying',
-                                                     this._escapeTray.bind(this));
+        this._bannerClickedId = this._banner.connect('done-displaying', () => {
+            Meta.enable_unredirect_for_display(global.display);
+            this._escapeTray();
+        });
         this._bannerUnfocusedId = this._banner.connect('unfocused', () => {
             this._updateState();
         });
@@ -1322,6 +1324,7 @@ var MessageTray = new Lang.Class({
         this._bannerBin.y = -this._banner.actor.height;
         this.actor.show();
 
+        Meta.disable_unredirect_for_display(global.display);
         this._updateShowingNotification();
 
         let [x, y, mods] = global.get_pointer();

js/ui/notificationDaemon.js

@@ -77,10 +77,8 @@ var FdoNotificationDaemon = new Lang.Class({
                  bitsPerSample, nChannels, data] = hints['image-data'];
             return Shell.util_create_pixbuf_from_data(data, GdkPixbuf.Colorspace.RGB, hasAlpha,
                                                       bitsPerSample, width, height, rowStride);
-        } else if (hints['image-path']) {
-            return new Gio.FileIcon({ file: Gio.File.new_for_path(hints['image-path']) });
         }
-        return null;
+        return this._iconForNotificationData(hints['image-path']);
     },
 
     _fallbackIconForNotificationData(hints) {

js/ui/osdWindow.js

@@ -118,15 +118,30 @@ var OsdWindow = new Lang.Class({
         this._hideTimeoutId = 0;
         this._reset();
 
-        Main.layoutManager.connect('monitors-changed',
-                                   this._relayout.bind(this));
+        this.actor.connect('destroy', this._onDestroy.bind(this));
+
+        this._monitorsChangedId =
+            Main.layoutManager.connect('monitors-changed',
+                                       this._relayout.bind(this));
         let themeContext = St.ThemeContext.get_for_stage(global.stage);
-        themeContext.connect('notify::scale-factor',
-                             this._relayout.bind(this));
+        this._scaleChangedId =
+            themeContext.connect('notify::scale-factor',
+                                 this._relayout.bind(this));
         this._relayout();
         Main.uiGroup.add_child(this.actor);
     },
 
+    _onDestroy() {
+        if (this._monitorsChangedId)
+            Main.layoutManager.disconnect(this._monitorsChangedId);
+        this._monitorsChangedId = 0;
+
+        let themeContext = St.ThemeContext.get_for_stage(global.stage);
+        if (this._scaleChangedId)
+            themeContext.disconnect(this._scaleChangedId);
+        this._scaleChangedId = 0;
+    },
+
     setIcon(icon) {
         this._icon.gicon = icon;
     },
@@ -204,8 +219,8 @@ var OsdWindow = new Lang.Class({
     _reset() {
         this.actor.hide();
         this.setLabel(null);
-        this.setLevel(null);
         this.setMaxLevel(null);
+        this.setLevel(null);
     },
 
     _relayout() {
@@ -253,8 +268,8 @@ var OsdWindowManager = new Lang.Class({
     _showOsdWindow(monitorIndex, icon, label, level, maxLevel) {
         this._osdWindows[monitorIndex].setIcon(icon);
         this._osdWindows[monitorIndex].setLabel(label);
-        this._osdWindows[monitorIndex].setLevel(level);
         this._osdWindows[monitorIndex].setMaxLevel(maxLevel);
+        this._osdWindows[monitorIndex].setLevel(level);
         this._osdWindows[monitorIndex].show();
     },
 

js/ui/panel.js

@@ -1093,6 +1093,7 @@ var Panel = new Lang.Class({
         let windows = activeWorkspace.list_windows().filter(metaWindow => {
             return metaWindow.is_on_primary_monitor() &&
                    metaWindow.showing_on_its_workspace() &&
+                   !metaWindow.is_hidden() &&
                    metaWindow.get_window_type() != Meta.WindowType.DESKTOP;
         });
 

js/ui/popupMenu.js

@@ -143,9 +143,10 @@ var PopupBaseMenuItem = new Lang.Class({
     _onKeyPressEvent(actor, event) {
         let state = event.get_state();
 
-        // if user has a modifier down (except capslock)
+        // if user has a modifier down (except capslock and numlock)
         // then don't handle the key press here
         state &= ~Clutter.ModifierType.LOCK_MASK;
+        state &= ~Clutter.ModifierType.MOD2_MASK;
         state &= Clutter.ModifierType.MODIFIER_MASK;
 
         if (state)

js/ui/windowManager.js

@@ -478,6 +478,7 @@ var TouchpadWorkspaceSwitchAction = new Lang.Class({
         this._dx = 0;
         this._dy = 0;
         actor.connect('captured-event', this._handleEvent.bind(this));
+	this._touchpadSettings = new Gio.Settings({schema_id: 'org.gnome.desktop.peripherals.touchpad'});
     },
 
     _checkActivated() {
@@ -515,7 +516,11 @@ var TouchpadWorkspaceSwitchAction = new Lang.Class({
 
             // Scale deltas up a bit to make it feel snappier
             this._dx += dx * 2;
-            this._dy += dy * 2;
+	    if(!(this._touchpadSettings.get_boolean('natural-scroll'))) 
+		this._dy -= dy * 2;
+	    else
+		this._dy += dy * 2;
+	    
             this.emit('motion', this._dx, this._dy);
         } else {
             if ((event.get_gesture_phase() == Clutter.TouchpadGesturePhase.END && ! this._checkActivated()) ||

js/ui/workspace.js

@@ -465,6 +465,8 @@ var WindowOverlay = new Lang.Class({
         title.clutter_text.ellipsize = Pango.EllipsizeMode.END;
         windowClone.actor.label_actor = title;
 
+        this._maxTitleWidth = -1;
+
         this._updateCaptionId = metaWindow.connect('notify::title', w => {
             this.title.text = w.title;
             this.title.text = this._getCaption();
@@ -528,6 +530,13 @@ var WindowOverlay = new Lang.Class({
                 Math.max(this.borderSize, this.closeButton.width - this.closeButton._overlap)];
     },
 
+    setMaxChromeWidth(max) {
+        if (this._maxTitleWidth == max)
+            return;
+
+        this._maxTitleWidth = max;
+    },
+
     relayout(animate) {
         let button = this.closeButton;
         let title = this.title;
@@ -554,13 +563,26 @@ var WindowOverlay = new Lang.Class({
         else
             button.set_position(Math.floor(buttonX), Math.floor(buttonY));
 
-        let titleX = cloneX + (cloneWidth - title.width) / 2;
+        // Clutter.Actor.get_preferred_width() will return the fixed width if
+        // one is set, so we need to reset the width by calling set_width(-1),
+        // to forward the call down to StLabel.
+        // We also need to save and restore the current width, otherwise the
+        // animation starts from the wrong point.
+        let prevTitleWidth = title.width;
+        title.set_width(-1);
+
+        let [titleMinWidth, titleNatWidth] = title.get_preferred_width(-1);
+        let titleWidth = Math.max(titleMinWidth,
+                                  Math.min(titleNatWidth, this._maxTitleWidth));
+        title.width = prevTitleWidth;
+
+        let titleX = cloneX + (cloneWidth - titleWidth) / 2;
         let titleY = cloneY + cloneHeight - (title.height - this.borderSize) / 2;
 
         if (animate) {
-            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), title.width);
+            this._animateOverlayActor(title, Math.floor(titleX), Math.floor(titleY), titleWidth);
         } else {
-            title.width = title.width;
+            title.width = titleWidth;
             title.set_position(Math.floor(titleX), Math.floor(titleY));
         }
 
@@ -1306,6 +1328,12 @@ var Workspace = new Lang.Class({
             let cloneHeight = clone.actor.height * scale;
             clone.slot = [x, y, cloneWidth, cloneHeight];
 
+            let cloneCenter = x + cloneWidth / 2;
+            let maxChromeWidth = 2 * Math.min(
+                cloneCenter - area.x,
+                area.x + area.width - cloneCenter);
+            overlay.setMaxChromeWidth(Math.round(maxChromeWidth));
+
             if (overlay && (initialPositioning || !clone.positioned))
                 overlay.hide();
 

js/ui/workspaceThumbnail.js

@@ -31,7 +31,7 @@ var WORKSPACE_CUT_SIZE = 10;
 
 var WORKSPACE_KEEP_ALIVE_TIME = 100;
 
-var OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
+var MUTTER_SCHEMA = 'org.gnome.mutter';
 
 /* A layout manager that requests size only for primary_actor, but then allocates
    all using a fixed layout */
@@ -674,7 +674,7 @@ var ThumbnailsBox = new Lang.Class({
         Main.overview.connect('window-drag-cancelled',
                               this._onDragCancelled.bind(this));
 
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
         this._settings.connect('changed::dynamic-workspaces',
             this._updateSwitcherVisibility.bind(this));
 

js/ui/workspacesView.js

@@ -24,7 +24,7 @@ var AnimationType = {
     FADE: 1
 };
 
-const OVERRIDE_SCHEMA = 'org.gnome.shell.overrides';
+const MUTTER_SCHEMA = 'org.gnome.mutter';
 
 var WorkspacesViewBase = new Lang.Class({
     Name: 'WorkspacesViewBase',
@@ -473,7 +473,7 @@ var WorkspacesDisplay = new Lang.Class({
         this._workspacesViews = [];
         this._primaryScrollAdjustment = null;
 
-        this._settings = new Gio.Settings({ schema_id: OVERRIDE_SCHEMA });
+        this._settings = new Gio.Settings({ schema_id: MUTTER_SCHEMA });
         this._settings.connect('changed::workspaces-only-on-primary',
                                this._workspacesOnlyOnPrimaryChanged.bind(this));
         this._workspacesOnlyOnPrimaryChanged();

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.30.1',
+  version: '3.30.2',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )

po/es.po

@@ -1635,7 +1635,7 @@ msgstr "Desconectado"
 
 #: js/ui/status/bluetooth.js:141
 msgid "On"
-msgstr "Encender"
+msgstr "Encendido"
 
 #: js/ui/status/brightness.js:44
 msgid "Brightness"

src/st/st-texture-cache.c

@@ -984,7 +984,7 @@ file_changed_cb (GFileMonitor      *monitor,
   char *key;
   guint file_hash;
 
-  if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
+  if (event_type != G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT)
     return;
 
   file_hash = g_file_hash (file);