diff --git a/NEWS b/NEWS index 4c29e27e..32ceb97c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +3.29.90 +======= +* Misc. bug fixes [Florian; #786496] + +Contributors: + Florian Müllner + 3.29.3 ====== * Adjust to global.screen removal [Jonas; #759538] diff --git a/data/00_org.gnome.shell.extensions.classic.gschema.override b/data/00_org.gnome.shell.extensions.classic.gschema.override new file mode 100644 index 00000000..c6701074 --- /dev/null +++ b/data/00_org.gnome.shell.extensions.classic.gschema.override @@ -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=['Tab','Tab'] diff --git a/data/gnome-shell-sass/_common.scss b/data/gnome-shell-sass/_common.scss index f1e6ae52..5338f284 100644 --- a/data/gnome-shell-sass/_common.scss +++ b/data/gnome-shell-sass/_common.scss @@ -128,12 +128,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 +588,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; } } @@ -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; diff --git a/data/meson.build b/data/meson.build index a807a3da..02ddf7d0 100644 --- a/data/meson.build +++ b/data/meson.build @@ -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) diff --git a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml b/data/org.gnome.shell.extensions.classic-overrides.gschema.xml deleted file mode 100644 index 83b89d92..00000000 --- a/data/org.gnome.shell.extensions.classic-overrides.gschema.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - true - Attach modal dialog to the parent window - - This key overrides the key in org.gnome.mutter when running - GNOME Shell. - - - - - "appmenu:minimize,maximize,close" - Arrangement of buttons on the titlebar - - This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Shell. - - - - - true - Enable edge tiling when dropping windows on screen edges - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - - true - Workspaces only on primary monitor - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - - true - Delay focus changes in mouse mode until the pointer stops moving - - This key overrides the key in org.gnome.mutter when running GNOME Shell. - - - - diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js index 96b252a2..8257eac8 100644 --- a/extensions/window-list/extension.js +++ b/extensions/window-list/extension.js @@ -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; @@ -933,10 +918,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; } @@ -1177,8 +1162,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(); diff --git a/meson.build b/meson.build index 3ae3a9b4..bfc99f7d 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('gnome-shell-extensions', - version: '3.29.3', + version: '3.29.90', 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', diff --git a/po/POTFILES.in b/po/POTFILES.in index d98ca1bc..c2b88992 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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