Compare commits

..

39 Commits

Author SHA1 Message Date
Simon McVittie
5486c2040d 3.30.1-1 2018-11-02 09:27:05 +00:00
Simon McVittie
84c95be03f d/p/gnome-session-classic-wrapper-script.patch: Re-word to avoid a Lintian warning 2018-11-02 09:26:42 +00:00
Simon McVittie
d9e6c6c4c5 Bump Standards-Version to 4.2.1 2018-11-02 09:23:06 +00:00
Simon McVittie
25559e758c New upstream release 2018-11-02 09:22:10 +00:00
Simon McVittie
89ce4aee4a Update upstream source from tag 'upstream/3.30.1'
Update to upstream version '3.30.1'
with Debian dir 0588a7440a
2018-11-02 09:22:10 +00:00
Simon McVittie
b1eb9b9080 New upstream version 3.30.1 2018-11-02 09:22:09 +00:00
Florian Müllner
94eba47358 Bump version to 3.30.1
Update NEWS.
2018-10-08 22:55:05 +02:00
Florian Müllner
d34933de0b Update sass submodule 2018-10-08 22:50:52 +02:00
Florian Müllner
9410bdfad6 window-list: Ignore hidden buttons when scrolling
Window lists are per-monitor, so workspaces are implemented by
simply hiding all buttons that correspond to windows/apps on
other workspaces. That means we need to take the visibility
into account when handling scroll-events to switch through the
list, or else we'll end up switching "randomly" between workspaces.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/78
2018-10-06 16:05:46 +00:00
Florian Müllner
d424b0f645 window-list: Minor clean-up
Modern javascript has explicit methods for locating the first
element of an array that meets a certain condition, use those
instead of manually looping over the array.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/78
2018-10-06 16:05:46 +00:00
Florian Müllner
c0454db0c6 appsMenu: Consider scale-factor in height computation
Actor heights are in physical pixels, while CSS measures are in logical
pixels, so we need to adjust accordingly to prevent the scale factor
from being applied twice.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/102
2018-09-23 17:31:03 +02:00
Jeremy Bicha
ba9d2e7919 releasing package gnome-shell-extensions version 3.30.0-1 2018-09-05 12:35:10 -04:00
Jeremy Bicha
9d0c742f34 Update debian/gbp.conf 2018-09-05 12:33:05 -04:00
Jeremy Bicha
1e69961bc7 New upstream release 2018-09-05 12:32:55 -04:00
Jeremy Bicha
e4ddc4c14e Update upstream source from tag 'upstream/3.30.0'
Update to upstream version '3.30.0'
with Debian dir d0677ad034
2018-09-05 12:32:29 -04:00
Jeremy Bicha
a0b6535210 New upstream version 3.30.0 2018-09-05 12:32:25 -04:00
Jeremy Bicha
be149bab3d Revert "d/watch: Watch for development versions"
This reverts commit e37782c2ce.
2018-09-05 12:31:44 -04:00
Florian Müllner
913b2ba691 Bump version to 3.30.0 2018-09-04 00:10:36 +02:00
Simon McVittie
1b4bbe19e3 3.29.91-1 2018-08-20 20:28:07 +01:00
Simon McVittie
2e6b602a04 d/p/series: Remove commented-out line 2018-08-20 20:00:42 +01:00
Simon McVittie
5b9012152c d/copyright: Remove unnecessary sentence fragment 2018-08-20 20:00:08 +01:00
Simon McVittie
efd20bb4f7 Sort dependency lists (wrap-and-sort -a) 2018-08-20 19:58:52 +01:00
Simon McVittie
7d595e4774 Bump Standards-Version to 4.2.0 2018-08-20 19:58:00 +01:00
Simon McVittie
7b4c3085c0 New upstream development release 2018-08-20 19:56:46 +01:00
Simon McVittie
9a9b3afa31 New upstream version 3.29.91 2018-08-20 19:55:42 +01:00
Simon McVittie
7045a5dcea Update upstream source from tag 'upstream/3.29.91'
Update to upstream version '3.29.91'
with Debian dir 7aa6de354f
2018-08-20 19:55:42 +01:00
Florian Müllner
ba51869b93 Bump version to 3.29.91
Update NEWS.
2018-08-20 15:48:53 +02:00
Florian Müllner
ffe6110ea9 Stop using conditional catch statements
They are a mozilla extension that is going away in SpiderMonkey 60.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/90
2018-08-13 12:00:22 +02:00
Simon McVittie
777bae87b5 3.29.90-1 2018-08-02 10:46:54 +01:00
Simon McVittie
06ae867c2f New upstream development release 2018-08-02 10:33:59 +01:00
Simon McVittie
77ebd3d202 Update upstream source from tag 'upstream/3.29.90'
Update to upstream version '3.29.90'
with Debian dir 556645e633
2018-08-02 10:32:11 +01:00
Simon McVittie
59bc054ef6 New upstream version 3.29.90 2018-08-02 10:32:10 +01:00
Florian Müllner
8b1bcc9fed Bump version to 3.29.90
Update NEWS.
2018-08-01 03:47:30 +02:00
Florian Müllner
ebad80c64d Update sass submodule 2018-08-01 03:46:05 +02:00
Simon McVittie
227f999001 3.29.3+really3.29.3-1 2018-07-27 23:58:30 +01:00
Simon McVittie
e37782c2ce d/watch: Watch for development versions 2018-07-27 10:49:37 +01:00
Florian Müllner
39caf951e0 data: Use override for default alt-tab keybindings
Per-desktop overrides aren't limited to keys in org.gnome.mutter, so
we can use them instead of the alternate-tab extension to default to
the window switcher in the classic session.

https://bugzilla.gnome.org/show_bug.cgi?id=786496
2018-07-09 19:18:54 +02:00
Florian Müllner
ecf28e13b4 window-list: Use correct settings schemas
Override schemas are gone (yay!), so we can now simply use the original
schema independent from the used session mode.

https://bugzilla.gnome.org/show_bug.cgi?id=786496
2018-07-09 19:18:54 +02:00
Florian Müllner
a01b44f7de data: Replace override schema with per-desktop override
GSettings now recognizes per-desktop overrides that can be used
to change schemas' default values for classic mode, so use that
instead of the separate override schema we currently use with
mutter's custom override mechanism.

https://bugzilla.gnome.org/show_bug.cgi?id=786496
2018-07-09 19:18:54 +02:00
18 changed files with 207 additions and 177 deletions

27
NEWS
View File

@@ -1,3 +1,30 @@
3.30.1
======
* apps-menu: Fix height on HiDPI systems [Florian; #102]
* window-list: Only switch between windows on active workspace when scrolling
[Florian; #78]
Contributors:
Florian Müllner
3.30.0
======
* Bump version
3.29.91
=======
* Misc. bug fixes [Florian; #90]
Contributors:
Florian Müllner
3.29.90
=======
* Misc. bug fixes [Florian; #786496]
Contributors:
Florian Müllner
3.29.3
======
* Adjust to global.screen removal [Jonas; #759538]

View File

@@ -0,0 +1,9 @@
[org.gnome.mutter:GNOME-Classic]
dynamic-workspaces=false
[org.gnome.desktop.wm.preferences:GNOME-Classic]
button-layout='appmenu:minimize,maximize,close'
[org.gnome.desktop.wm.keybindings:GNOME-Classic]
switch-applications=[]
switch-windows=['<Super>Tab','<Alt>Tab']

View File

@@ -48,17 +48,18 @@ stage {
padding: 4px 32px;
@include button(normal);
&:focus { @include button(focus); }
&:hover { @include button(hover); }
&:insensitive { @include button(insensitive); }
&:active { @include button(active); }
}
.modal-dialog-linked-button {
border-right-width: 1px;
@include button(normal);
&:insensitive { @include button(insensitive); }
&:active { @include button(active); }
&:focus { @include button(focus); }
&:hover { @include button(hover); }
&:active { @include button(active); }
padding: 12px;
&:first-child {
@@ -128,12 +129,15 @@ StScrollBar {
.slider {
height: 1em;
-slider-height: 0.3em;
-slider-background-color: $insensitive_bg_color; //background of the trough
-slider-border-color: $borders_color; //trough border color
-slider-active-background-color: $selected_bg_color; //active trough fill
-slider-active-border-color: darken($selected_bg_color,10%); //active trough border
-slider-border-width: 1px;
-barlevel-height: 0.3em;
-barlevel-background-color: $insensitive_bg_color; //background of the trough
-barlevel-border-color: $borders_color; //trough border color
-barlevel-active-background-color: $selected_bg_color; //active trough fill
-barlevel-active-border-color: darken($selected_bg_color,10%); //active trough border
-barlevel-overdrive-color: $destructive_color;
-barlevel-overdrive-border-color: darken($destructive_color,10%);
-barlevel-overdrive-separator-width: 0.2em;
-barlevel-border-width: 1px;
-slider-handle-radius: 6px;
}
@@ -585,13 +589,11 @@ StScrollBar {
.osd-monitor-label { font-size: 3em; }
.level {
height: 0.6em;
border-radius: 0.3em;
background-color: transparentize(darken($osd_bg_color,15%),0.5);
color: $osd_fg_color;
}
.level-bar {
background-color: $osd_fg_color;
border-radius: 0.3em;
-barlevel-height: 0.6em;
-barlevel-background-color: transparentize(darken($osd_bg_color,15%),0.5);
-barlevel-active-background-color: $osd_fg_color;
-barlevel-overdrive-color: $destructive_color;
-barlevel-overdrive-separator-width: 0.2em;
}
}
@@ -687,7 +689,6 @@ StScrollBar {
height: 50px;
background-color: $selected_bg_color;
color: $selected_fg_color;
//background-image: url("resource:///org/gnome/shell/theme/ws-switch-arrow-up.png");
background-size: 32px;
border-radius: 8px;
}
@@ -825,6 +826,8 @@ StScrollBar {
.screencast-indicator { color: $warning_color; }
.remote-access-indicator { color: $warning_color; }
&.solid {
background-color: black;
/* transition from transparent to solid */
@@ -1122,6 +1125,7 @@ StScrollBar {
}
.system-menu-action {
-st-icon-style: symbolic;
color: $fg_color;
border-radius: 32px; /* wish we could do 50% */
padding: 13px;

View File

@@ -150,8 +150,8 @@
//
// focused button
//
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.5),
$osd_bg_color);
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
lighten($osd_bg_color,3%));
color: $osd_fg_color;
text-shadow: 0 1px black;
@@ -164,7 +164,7 @@
// active osd button
//
$_bg: if($c!=$osd_bg_color, transparentize($c, 0.3),
lighten($osd_bg_color,10%));
lighten($osd_bg_color,3%));
color: white;
border-color: $osd_borders_color;
@@ -182,7 +182,7 @@
color: white;
border-color: $osd_borders_color;
background-color: darken($_bg,5%);
background-color: $selected_bg_color;
// This should be none, but it's creating some issues with borders, so to
// workaround it for now, use inset wich goes through a different code path.
// see https://bugzilla.gnome.org/show_bug.cgi?id=752934

View File

@@ -59,5 +59,5 @@ custom_target(style + '.css',
install_data(theme_data, install_dir: themedir)
classic_schema = 'org.gnome.shell.extensions.classic-overrides.gschema.xml'
install_data(classic_schema, install_dir: schemadir)
classic_override = '00_org.gnome.shell.extensions.classic.gschema.override'
install_data(classic_override, install_dir: schemadir)

View File

@@ -1,46 +0,0 @@
<schemalist>
<schema id="org.gnome.shell.extensions.classic-overrides"
path="/org/gnome/shell/extensions/classic-overrides/"
gettext-domain="gnome-shell-extensions">
<key name="attach-modal-dialogs" type="b">
<default>true</default>
<summary>Attach modal dialog to the parent window</summary>
<description>
This key overrides the key in org.gnome.mutter when running
GNOME Shell.
</description>
</key>
<key name="button-layout" type="s">
<default>"appmenu:minimize,maximize,close"</default>
<summary>Arrangement of buttons on the titlebar</summary>
<description>
This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell.
</description>
</key>
<key name="edge-tiling" type="b">
<default>true</default>
<summary>Enable edge tiling when dropping windows on screen edges</summary>
<description>
This key overrides the key in org.gnome.mutter when running GNOME Shell.
</description>
</key>
<key name="workspaces-only-on-primary" type="b">
<default>true</default>
<summary>Workspaces only on primary monitor</summary>
<description>
This key overrides the key in org.gnome.mutter when running GNOME Shell.
</description>
</key>
<key name="focus-change-on-pointer-rest" type="b">
<default>true</default>
<summary>Delay focus changes in mouse mode until the pointer stops moving</summary>
<description>
This key overrides the key in org.gnome.mutter when running GNOME Shell.
</description>
</key>
</schema>
</schemalist>

45
debian/changelog vendored
View File

@@ -1,3 +1,48 @@
gnome-shell-extensions (3.30.1-1) unstable; urgency=medium
* Team upload
* New upstream release
* Bump Standards-Version to 4.2.1
* d/p/gnome-session-classic-wrapper-script.patch:
Re-word to avoid a Lintian warning
-- Simon McVittie <smcv@debian.org> Fri, 02 Nov 2018 09:26:47 +0000
gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
* New upstream release
* Release to unstable
-- Jeremy Bicha <jbicha@debian.org> Wed, 05 Sep 2018 12:34:40 -0400
gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
* Team upload
* New upstream development release
* Bump Standards-Version to 4.2.0
* Sort dependency lists (wrap-and-sort -a)
* d/copyright: Remove unnecessary sentence fragment
* d/p/series: Remove commented-out line
-- Simon McVittie <smcv@debian.org> Mon, 20 Aug 2018 20:27:57 +0100
gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
* Team upload
* New upstream development release
-- Simon McVittie <smcv@debian.org> Thu, 02 Aug 2018 10:46:44 +0100
gnome-shell-extensions (3.29.3+really3.29.3-1) experimental; urgency=medium
* Team upload
* d/watch: Watch for development versions
* Re-upload to experimental with a higher version than
3.29.3+really3.28.1-1, which reverted the incorrect upload of the
previous version to unstable
-- Simon McVittie <smcv@debian.org> Fri, 27 Jul 2018 23:56:10 +0100
gnome-shell-extensions (3.29.3-1) unstable; urgency=medium
* Team upload

14
debian/control vendored
View File

@@ -12,26 +12,26 @@ Build-Depends: debhelper (>= 11.1.3),
meson (>= 0.44.0),
sassc
Rules-Requires-Root: no
Standards-Version: 4.1.5
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
Package: gnome-shell-extensions
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-atk-1.0,
Depends: gir1.2-atk-1.0,
gir1.2-clutter-1.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-glib-2.0,
gir1.2-gmenu-3.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
gvfs (>= 1.16.0),
gnome-session-bin (>= 3.8),
gnome-settings-daemon (>= 3.24)
gnome-settings-daemon (>= 3.24),
gnome-shell (<< ${gnome:NextVersion}),
gnome-shell (>= ${gnome:Version}),
gvfs (>= 1.16.0),
${misc:Depends}
Recommends: gnome-tweaks
Replaces: gnome-shell-common (<< 3.18)
Breaks: gnome-shell-common (<< 3.18)

14
debian/control.in vendored
View File

@@ -8,26 +8,26 @@ Build-Depends: debhelper (>= 11.1.3),
meson (>= 0.44.0),
sassc
Rules-Requires-Root: no
Standards-Version: 4.1.5
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
Package: gnome-shell-extensions
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-atk-1.0,
Depends: gir1.2-atk-1.0,
gir1.2-clutter-1.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-glib-2.0,
gir1.2-gmenu-3.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
gvfs (>= 1.16.0),
gnome-session-bin (>= 3.8),
gnome-settings-daemon (>= 3.24)
gnome-settings-daemon (>= 3.24),
gnome-shell (<< ${gnome:NextVersion}),
gnome-shell (>= ${gnome:Version}),
gvfs (>= 1.16.0),
${misc:Depends}
Recommends: gnome-tweaks
Replaces: gnome-shell-common (<< 3.18)
Breaks: gnome-shell-common (<< 3.18)

3
debian/copyright vendored
View File

@@ -24,8 +24,5 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

9
debian/gbp.conf vendored
View File

@@ -3,3 +3,12 @@ pristine-tar = True
debian-branch = debian/master
upstream-branch = upstream/latest
upstream-vcs-tag = %(version)s
[buildpackage]
sign-tags = True
[import-orig]
postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
[pq]
patch-numbers = False

View File

@@ -2,7 +2,7 @@ From: Michael Biebl <biebl@debian.org>
Date: Tue, 30 Jan 2018 09:04:03 +0000
Subject: Use a wrapper script to start GNOME classic session
Xsession currently doesn't allow to pass more then one argument, as it
Xsession currently doesn't allow passing more then one argument, as it
otherwise fails with
Xsession: unable to launch "gnome-session --session classic" X session ---
"gnome-session --session classic" not found; falling back to default session.

View File

@@ -1,2 +1 @@
#dont-require-nautilus-classic.patch
gnome-session-classic-wrapper-script.patch

View File

@@ -685,7 +685,10 @@ class ApplicationsButton extends PanelMenu.Button {
//Load applications
this._displayButtons(this._listApplications(null));
let height = this.categoriesBox.height + MENU_HEIGHT_OFFSET + 'px';
let themeContext = St.ThemeContext.get_for_stage(global.stage);
let scaleFactor = themeContext.scale_factor;
let categoriesHeight = this.categoriesBox.height / scaleFactor;
let height = Math.round(categoriesHeight) + MENU_HEIGHT_OFFSET + 'px';
this.mainBox.style+=('height: ' + height);
}

View File

@@ -50,33 +50,35 @@ class PlaceInfo {
return (_ignored, result) => {
try {
Gio.AppInfo.launch_default_for_uri_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
let source = {
get_icon: () => { return this.icon; }
};
let op = new ShellMountOperation.ShellMountOperation(source);
this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
try {
op.close();
file.mount_enclosing_volume_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
// e.g. user canceled the password dialog
return;
} catch(e) {
Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
return;
}
if (tryMount) {
let callback = this._createLaunchCallback(launchContext, false);
Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
launchContext,
null,
callback);
}
});
} catch(e) {
Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
let source = {
get_icon: () => { return this.icon; }
};
let op = new ShellMountOperation.ShellMountOperation(source);
this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
try {
op.close();
file.mount_enclosing_volume_finish(result);
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
// e.g. user canceled the password dialog
return;
Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
return;
}
if (tryMount) {
let callback = this._createLaunchCallback(launchContext, false);
Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
launchContext,
null,
callback);
}
});
} else {
Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
}
}
}
}
@@ -97,8 +99,10 @@ class PlaceInfo {
let info = file.query_info_finish(result);
this.icon = info.get_symbolic_icon();
this.emit('changed');
} catch(e if e instanceof Gio.IOErrorEnum) {
return;
} catch(e) {
if (e instanceof Gio.IOErrorEnum)
return;
throw e;
}
});
@@ -123,8 +127,10 @@ class PlaceInfo {
try {
let info = this.file.query_info('standard::display-name', 0, null);
return info.get_display_name();
} catch(e if e instanceof Gio.IOErrorEnum) {
return this.file.get_basename();
} catch(e) {
if (e instanceof Gio.IOErrorEnum)
return this.file.get_basename();
throw e;
}
}
};
@@ -349,8 +355,10 @@ var PlacesManager = class {
let file = Gio.File.new_for_path(specialPath), info;
try {
info = new PlaceInfo('special', file);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
continue;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
continue;
throw e;
}
specials.push(info);
@@ -514,8 +522,10 @@ var PlacesManager = class {
try {
devItem = new PlaceDeviceInfo(kind, mount);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
return;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
return;
throw e;
}
this._places[kind].push(devItem);
@@ -526,8 +536,10 @@ var PlacesManager = class {
try {
volItem = new PlaceVolumeInfo(kind, volume);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
return;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
return;
throw e;
}
this._places[kind].push(volItem);

View File

@@ -799,14 +799,12 @@ class WindowList {
indicatorsBox.add(this._workspaceIndicator.container, { expand: false, y_fill: true });
this._mutterSettings = new Gio.Settings({ schema_id: 'org.gnome.mutter' });
this._workspaceSettings = this._getWorkspaceSettings();
this._workspacesOnlyOnPrimaryChangedId =
this._workspaceSettings.connect('changed::workspaces-only-on-primary',
this._updateWorkspaceIndicatorVisibility.bind(this));
this._dynamicWorkspacesSettings = this._getDynamicWorkspacesSettings();
this._mutterSettings.connect('changed::workspaces-only-on-primary',
this._updateWorkspaceIndicatorVisibility.bind(this));
this._dynamicWorkspacesChangedId =
this._dynamicWorkspacesSettings.connect('changed::dynamic-workspaces',
this._updateWorkspaceIndicatorVisibility.bind(this));
this._mutterSettings.connect('changed::dynamic-workspaces',
this._updateWorkspaceIndicatorVisibility.bind(this));
this._updateWorkspaceIndicatorVisibility();
this._menuManager = new PopupMenu.PopupMenuManager(this);
@@ -890,19 +888,6 @@ class WindowList {
this._groupingModeChanged();
}
_getDynamicWorkspacesSettings() {
if (this._workspaceSettings.list_keys().includes('dynamic-workspaces'))
return this._workspaceSettings;
return this._mutterSettings;
}
_getWorkspaceSettings() {
let settings = global.get_overrides_settings() || this._mutterSettings;
if (settings.list_keys().includes('workspaces-only-on-primary'))
return settings;
return this._mutterSettings;
}
_onScrollEvent(actor, event) {
let direction = event.get_scroll_direction();
let diff = 0;
@@ -913,17 +898,12 @@ class WindowList {
else
return;
let children = this._windowList.get_children().map(a => a._delegate);
let active = 0;
for (let i = 0; i < children.length; i++) {
if (children[i].active) {
active = i;
break;
}
}
active = Math.max(0, Math.min(active + diff, children.length-1));
children[active].activate();
let children = this._windowList.get_children()
.filter(c => c.visible)
.map(a => a._delegate);
let active = children.findIndex(c => c.active);
let newActive = Math.max(0, Math.min(active + diff, children.length-1));
children[newActive].activate();
}
_updatePosition() {
@@ -933,10 +913,10 @@ class WindowList {
_updateWorkspaceIndicatorVisibility() {
let workspaceManager = global.workspace_manager;
let hasWorkspaces = this._dynamicWorkspacesSettings.get_boolean('dynamic-workspaces') ||
let hasWorkspaces = this._mutterSettings.get_boolean('dynamic-workspaces') ||
workspaceManager.n_workspaces > 1;
let workspacesOnMonitor = this._monitor == Main.layoutManager.primaryMonitor ||
!this._workspaceSettings.get_boolean('workspaces-only-on-primary');
!this._mutterSettings.get_boolean('workspaces-only-on-primary');
this._workspaceIndicator.actor.visible = hasWorkspaces && workspacesOnMonitor;
}
@@ -1038,12 +1018,9 @@ class WindowList {
_removeApp(app) {
let children = this._windowList.get_children();
for (let i = 0; i < children.length; i++) {
if (children[i]._delegate.app == app) {
children[i].destroy();
return;
}
}
let child = children.find(c => c._delegate.app == app);
if (child)
child.destroy();
}
_onWindowAdded(ws, win) {
@@ -1057,10 +1034,8 @@ class WindowList {
return;
let children = this._windowList.get_children();
for (let i = 0; i < children.length; i++) {
if (children[i]._delegate.metaWindow == win)
return;
}
if (children.find(c => c._delegate.metaWindow == win))
return;
let button = new WindowButton(win, this._perMonitor, this._monitor.index);
this._windowList.layout_manager.pack(button.actor,
@@ -1080,12 +1055,9 @@ class WindowList {
return; // not actually removed, just moved to another workspace
let children = this._windowList.get_children();
for (let i = 0; i < children.length; i++) {
if (children[i]._delegate.metaWindow == win) {
children[i].destroy();
return;
}
}
let child = children.find(c => c._delegate.metaWindow == win);
if (child)
child.destroy();
}
_onWorkspacesChanged() {
@@ -1177,8 +1149,8 @@ class WindowList {
}
_onDestroy() {
this._workspaceSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
this._dynamicWorkspacesSettings.disconnect(this._dynamicWorkspacesChangedId);
this._mutterSettings.disconnect(this._workspacesOnlyOnPrimaryChangedId);
this._mutterSettings.disconnect(this._dynamicWorkspacesChangedId);
this._workspaceIndicator.destroy();

View File

@@ -1,5 +1,5 @@
project('gnome-shell-extensions',
version: '3.29.3',
version: '3.30.1',
meson_version: '>= 0.44.0',
license: 'GPL2+'
)
@@ -34,7 +34,6 @@ endif
uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
classic_extensions = [
'alternate-tab',
'apps-menu',
'places-menu',
'launch-new-instance',
@@ -43,6 +42,7 @@ classic_extensions = [
default_extensions = classic_extensions
default_extensions += [
'alternate-tab',
'drive-menu',
'screenshot-window-sizer',
'windowsNavigator',

View File

@@ -1,6 +1,5 @@
data/gnome-classic.desktop.in
data/gnome-classic.session.desktop.in
data/org.gnome.shell.extensions.classic-overrides.gschema.xml
extensions/alternate-tab/prefs.js
extensions/apps-menu/extension.js
extensions/auto-move-windows/extension.js