diff options
Diffstat (limited to '')
37 files changed, 2876 insertions, 2826 deletions
diff --git a/extensions/45/vertical-workspaces/CHANGELOG.md b/extensions/45/vertical-workspaces/CHANGELOG.md index 0ea09cc..18de9a5 100644 --- a/extensions/45/vertical-workspaces/CHANGELOG.md +++ b/extensions/45/vertical-workspaces/CHANGELOG.md @@ -1,5 +1,36 @@ ## Changelog: -### v45.2 for GNOME 45.2+, v44.10 for GNOME 42-44 (2023-12-03) +### v46.1 for GNOME 45.2+, v44.12 for GNOME 42-44 (not released yet) +**Added** +- Support for GNOME 46 +- Option *Fix New Window Not On Current Monitor* tries to work around that issue. However, success rate is not 100% + +**Changed** +- Windows and Extensions search providers have been removed from the V-Shell and released as a standalone WSP and ESP extensions. Respective module switches has been replaced in Settings by the links to these new extensions +- Window thumbnails (PiP) module moved to the standalone extension WTMB, link added to the *Modules* tab of Settings window +- Shortcuts in the overview - `Ctrl+Space` - Extensions Search Provider, `Shift+Space` - Recent Files Search Provider, `Ctrl+Shift+Space` - V-Shell Settings +- Bottom OSD position moved so it's not overlapping dock, if used +- Active folder icons hover animation from scale, which makes icons blurry, to the move 3px up + +**Fixed:** +- Running app indicators too close to the app name on the app grid +- OverlayKey module deactivates itself even if its configuration isn't consistent with the default GNOME Shell behavior + + +### v45.3 for GNOME 45.2+, v44.11 for GNOME 42-44 (2023-12-20) +**Added:** +- Option *Workspace Switcher Mode (Isolate Monitors)* can simulate independent switching of workspaces on any monitor +- Improved *Extensions Search Provider* allows seamless extension de/activation + +**Fixed:** +- DtD breaks overview on the primary monitor because of incorrect dash/dock position readings +- *Window Switcher > Ignore Last (empty) Workspace* should work only for dynamic workspaces mode +- *OverlayKey* module should remain disabled when the overlay-key functionality is set to default to minimize conflicts with other extensions +- Errors from parental manager when registering search provider modules +- Extension settings window sometimes fails to open when another extension settings window is already open +- Vertically oriented dash items should be selectable even with the mouse pointer at the edge of the screen + + +### v45.2 for GNOME 45.2+, v44.10 for GNOME 42-44 (2023-12-02) **Added:** - *Dash* option *Isolate Workspaces* on *Behavior* tab - *Brightness for Search View* option allows adjusting background wallpaper brightness in overview search view diff --git a/extensions/45/vertical-workspaces/README.md b/extensions/45/vertical-workspaces/README.md index 9ff690c..8adfff2 100644 --- a/extensions/45/vertical-workspaces/README.md +++ b/extensions/45/vertical-workspaces/README.md @@ -2,7 +2,7 @@ A GNOME Shell extension that lets you customize your GNOME Shell UX to suit your workflow, whether you like horizontally or vertically stacked workspaces. -Currently supported GNOME versions: 42 - 45 +Currently supported GNOME versions: 42 - 46 [<img alt="" height="100" src="https://raw.githubusercontent.com/andyholmes/gnome-shell-extensions-badge/master/get-it-on-ego.svg?sanitize=true">](https://extensions.gnome.org/extension/5177/vertical-workspaces/) @@ -25,17 +25,16 @@ Currently supported GNOME versions: 42 - 45 - Title captions of window previews moved into the preview (originally beneath the preview) and can be set as always visible. Adjustable window preview icon - Static background in workspace switcher (outside overview). Keeps Conky below, DING desktop icons stay visible (if not covered by windows) - Control over transition animations, including speed -- Window search provider with *Space* hotkey allows quick window navigation - Recent files search provider with *Ctrl + Space* hotkey -- Extensions search provider with *Ctrl + Shift + Space* hotkey allows to search for extensions, open their settings and enable or disable them +- Supports WSP (Window search provider) extension with *Space* hotkey that allows quick window navigation +- Supports ESP (Extensions search provider) with *Ctrl + Shift + Space* hotkey that allows to search for installed extensions, open their settings and enable or disable them - Reorder workspaces in overview using *Shift + Scroll* or *Shift + Page Up/Down* - Adds *Force Quit*, *Close Windows on Current Workspace* and *Move Windows to Current Workspace* items to app icon menu. The latter action can be activated using *Shift + click* on app icon - Change notification banners and OSD popups position - Window attention handler options can activate the attention-demanding window immediately or silence its notification - Optional position of the hot corner that can follow the dash and expand to hot edge - Super key double-press options -- Window thumbnail (PIP) options allows you to create scaled down clone of the window by clicking on its preview in the overview (secondary mouse buttons or window preview icon) - +- Supports WTMB (Window Thumbnails) extension that allows you to create Picture-in-Picture thumbnail of the window by clicking on its preview in the overview (secondary mouse buttons or window preview icon) ## Changelog [CHANGELOG.md](CHANGELOG.md) diff --git a/extensions/45/vertical-workspaces/extension.js b/extensions/45/vertical-workspaces/extension.js index 44ea42b..0378e0b 100644 --- a/extensions/45/vertical-workspaces/extension.js +++ b/extensions/45/vertical-workspaces/extension.js @@ -3,7 +3,7 @@ * extension.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -50,10 +50,6 @@ import { WindowPreviewModule } from './lib/windowPreview.js'; import { WorkspaceAnimationModule } from './lib/workspaceAnimation.js'; import { WorkspaceModule } from './lib/workspace.js'; import { WorkspaceSwitcherPopupModule } from './lib/workspaceSwitcherPopup.js'; -import { WindowSearchProviderModule } from './lib/windowSearchProvider.js'; -import { RecentFilesSearchProviderModule } from './lib/recentFilesSearchProvider.js'; -import { ExtensionsSearchProviderModule } from './lib/extensionsSearchProvider.js'; -import { WinTmbModule } from './lib/winTmb.js'; let Me; // gettext @@ -73,9 +69,10 @@ export default class VShell extends Extension.Extension { Me.gettext = this.gettext.bind(this); _ = Me.gettext; - Me.WSP_PREFIX = WindowSearchProviderModule._PREFIX; - Me.RFSP_PREFIX = RecentFilesSearchProviderModule._PREFIX; - Me.ESP_PREFIX = ExtensionsSearchProviderModule._PREFIX; + // search prefixes for supported search providers + Me.WSP_PREFIX = 'wq//'; + Me.RFSP_PREFIX = 'fq//'; + Me.ESP_PREFIX = 'eq//'; Me.opt = new Me.Settings.Options(Me); @@ -108,11 +105,7 @@ export default class VShell extends Extension.Extension { this.removeVShell(); this._disposeModules(); - // If Dash to Dock is enabled, disabling V-Shell can end in broken overview - Main.overview.hide(); - console.debug(`${Me.metadata.name}: disabled`); - this._cleanGlobals(); } @@ -144,10 +137,6 @@ export default class VShell extends Extension.Extension { Me.Modules.workspaceSwitcherPopupModule = new WorkspaceSwitcherPopupModule(Me); Me.Modules.workspaceThumbnailModule = new WorkspaceThumbnailModule(Me); Me.Modules.workspacesViewModule = new WorkspacesViewModule(Me); - Me.Modules.windowSearchProviderModule = new WindowSearchProviderModule(Me); - Me.Modules.recentFilesSearchProviderModule = new RecentFilesSearchProviderModule(Me); - Me.Modules.extensionsSearchProviderModule = new ExtensionsSearchProviderModule(Me); - Me.Modules.winTmbModule = new WinTmbModule(Me); } _disposeModules() { @@ -160,9 +149,7 @@ export default class VShell extends Extension.Extension { } Me.Util.cleanGlobals(); - Me.Modules = null; - opt = null; } activateVShell() { @@ -173,6 +160,8 @@ export default class VShell extends Extension.Extension { this._removeTimeouts(); this._timeouts = {}; + this._ensureOverviewIsHidden(); + // load VShell configuration this._updateSettings(); @@ -200,9 +189,16 @@ export default class VShell extends Extension.Extension { // workaround for upstream bug - overview always shows workspace 1 instead of the active one after restart this._setInitialWsIndex(); + + this._resetShellProperties(); } removeVShell() { + // Rebasing V-Shell when overview is open causes problems + // also if Dash to Dock is enabled, disabling V-Shell can result in a broken overview + this._ensureOverviewIsHidden(); + this._resetShellProperties(); + this._enabled = false; const reset = true; @@ -217,27 +213,53 @@ export default class VShell extends Extension.Extension { // switch PageUp/PageDown workspace switcher shortcuts this._switchPageShortcuts(); - // remove any position offsets from dash and ws thumbnails - if (!Me.Util.dashNotDefault()) { - Main.overview.dash.translation_x = 0; - Main.overview.dash.translation_y = 0; - } - Main.overview._overview._controls._thumbnailsBox.translation_x = 0; - Main.overview._overview._controls._thumbnailsBox.translation_y = 0; - Main.overview._overview._controls._searchEntryBin.translation_y = 0; - Main.overview._overview._controls.set_child_above_sibling(Main.overview._overview._controls._workspacesDisplay, null); - // restore default animation speed - St.Settings.get().slow_down_factor = 1; - - // restore default dash background style - Main.overview.dash._background.set_style(''); // hide status message if shown this._showStatusMessage(false); this._prevDash = null; + // restore default animation speed + St.Settings.get().slow_down_factor = 1; + Meta.Workspace.prototype.get_neighbor = this._originalGetNeighbor; } + _ensureOverviewIsHidden() { + if (Main.overview._shown) { + Main.overview._shown = false; + // Main.overview._animationInProgress = true; + Main.overview._visibleTarget = false; + Main.overview._overview.prepareToLeaveOverview(); + Main.overview._changeShownState('HIDING'); + Main.overview._hideDone(); + Main.overview.dash.showAppsButton.checked = false; + } + } + + _resetShellProperties() { + const controls = Main.overview._overview.controls; + // remove any position offsets from dash and ws thumbnails + if (!Me.Util.dashNotDefault()) { + controls.dash.translation_x = 0; + controls.dash.translation_y = 0; + } + controls._thumbnailsBox.translation_x = 0; + controls._thumbnailsBox.translation_y = 0; + controls._searchEntryBin.translation_y = 0; + controls._workspacesDisplay.scale_x = 1; + controls.set_child_above_sibling(controls._workspacesDisplay, null); + + // following properties may be reduced if extensions are rebased while the overview is open + controls._thumbnailsBox.remove_all_transitions(); + controls._thumbnailsBox.scale_x = 1; + controls._thumbnailsBox.scale_y = 1; + controls._thumbnailsBox.opacity = 255; + + controls._searchController._searchResults.opacity = 255; + + // restore default dash background style + controls.dash._background.set_style(''); + } + _removeTimeouts() { if (this._timeouts) { Object.values(this._timeouts).forEach(id => { @@ -270,7 +292,7 @@ export default class VShell extends Extension.Extension { Me.Util.getEnabledExtensions('ubuntu-dock').length); // force enable Fix Dash to Dock option if DtD detected - opt._watchDashToDock = dtdEnabled; + this._watchDashToDock = dtdEnabled; } _updateConnections() { @@ -289,7 +311,6 @@ export default class VShell extends Extension.Extension { () => { Me.Modules.panelModule.update(); Me.Modules.overviewControlsModule.update(); - Me.Modules.winTmbModule.showThumbnails(); this._timeouts.unlock = 0; return GLib.SOURCE_REMOVE; @@ -297,7 +318,6 @@ export default class VShell extends Extension.Extension { ); } else if (session.currentMode === 'unlock-dialog') { Me.Modules.panelModule.update(true); - Me.Modules.winTmbModule.hideThumbnails(); } }); } @@ -326,12 +346,46 @@ export default class VShell extends Extension.Extension { const reset = [1, 2].includes(extension.state); const dashReplacement = uuid.includes('dash-to-dock') || uuid.includes('ubuntu-dock') || uuid.includes('dash-to-panel'); if (dashReplacement && reset) - opt._watchDashToDock = true; + this._watchDashToDock = true; if (!Main.layoutManager._startingUp && reset && dashReplacement) this._updateVShell(1999); } ); } + + this._updateNewWindowConnection(); + } + + _updateNewWindowConnection() { + const nMonitors = global.display.get_n_monitors(); + if (nMonitors > 1 && opt.FIX_NEW_WINDOW_MONITOR && !this._newWindowCreatedConId) { + this._newWindowCreatedConId = global.display.connect_after('window-created', (w, win) => { + if (Main.layoutManager._startingUp || win.get_window_type() !== Meta.WindowType.NORMAL) + return; + const winActor = win.get_compositor_private(); + const _moveWinToMonitor = () => { + const currentMonitor = global.display.get_current_monitor(); + if (win.get_monitor() !== currentMonitor) { + // some windows ignore this action if executed immediately + GLib.idle_add(GLib.PRIORITY_LOW, () => { + win.move_to_monitor(currentMonitor); + return GLib.SOURCE_REMOVE; + }); + } + }; + if (!winActor.realized) { + const realizeId = winActor.connect('realize', () => { + winActor.disconnect(realizeId); + _moveWinToMonitor(); + }); + } else { + _moveWinToMonitor(); + } + }); + } else if ((nMonitors.length === 1 || !opt.FIX_NEW_WINDOW_MONITOR) && this._newWindowCreatedConId) { + global.display.disconnect(this._newWindowCreatedConId); + this._newWindowCreatedConId = 0; + } } _removeConnections() { @@ -354,6 +408,11 @@ export default class VShell extends Extension.Extension { Main.extensionManager.disconnect(this._watchDockSigId); this._watchDockSigId = 0; } + + if (this._newWindowCreatedConId) { + global.display.disconnect(this._newWindowCreatedConId); + this._newWindowCreatedConId = 0; + } } _updateOverrides(reset = false) { @@ -387,10 +446,6 @@ export default class VShell extends Extension.Extension { Me.Modules.searchModule.update(reset); - Me.Modules.windowSearchProviderModule.update(reset); - Me.Modules.recentFilesSearchProviderModule.update(reset); - Me.Modules.extensionsSearchProviderModule.update(reset); - // don't rebuild app grid on any screen lock // even if the extension includes unlock-screen session mode // disable/enable is called at least once even on GS44 @@ -423,7 +478,6 @@ export default class VShell extends Extension.Extension { Me.Modules.osdWindowModule.update(reset); Me.Modules.overlayKeyModule.update(reset); Me.Modules.searchControllerModule.update(reset); - Me.Modules.winTmbModule.update(reset); if (!reset && !Main.layoutManager._startingUp) Main.overview._overview.controls.setInitialTranslations(); @@ -441,7 +495,7 @@ export default class VShell extends Extension.Extension { if (!Main.overview._overview.controls._bgManagers && (opt.SHOW_BG_IN_OVERVIEW || opt.SHOW_WS_PREVIEW_BG) && !Me.Util.getEnabledExtensions('blur-my-shell').length) Main.overview._overview.controls._setBackground(); - if (opt._watchDashToDock) { + if (this._watchDashToDock) { // workaround for Dash to Dock (Ubuntu Dock) breaking overview allocations after enabled and changed position // DtD replaces dock and its _workId on every position change const dash = Main.overview.dash; @@ -573,6 +627,12 @@ export default class VShell extends Extension.Extension { else Meta.Workspace.prototype.get_neighbor = this._originalGetNeighbor; + // delay search so it doesn't make the search view transition stuttering + // 150 is the default value in GNOME Shell, but the search feels laggy + // Of course there is some overload for fast keyboard typist + if (opt.SEARCH_VIEW_ANIMATION) + opt.SEARCH_DELAY = 150; + if (settings) this._applySettings(key); } @@ -601,6 +661,9 @@ export default class VShell extends Extension.Extension { if (key?.includes('hot-corner') || key?.includes('dash')) Me.Modules.layoutModule.update(); + if (key?.includes('overlay-key')) + Me.Modules.overlayKeyModule.update(); + switch (key) { case 'ws-thumbnails-position': this._updateOverrides(); @@ -626,12 +689,15 @@ export default class VShell extends Extension.Extension { case 'osd-position': Me.Modules.osdWindowModule.update(); break; - case 'overlay-key': - Me.Modules.overlayKeyModule.update(); - break; case 'always-activate-selected-window': Me.Modules.windowPreviewModule.update(); break; + case 'ws-switcher-mode': + Me.Modules.windowManagerModule.update(); + break; + case 'new-window-monitor-fix': + this._updateNewWindowConnection(); + break; } if (key?.includes('app-grid') || @@ -775,7 +841,7 @@ export default class VShell extends Extension.Extension { _getNeighbor(direction) { // workspace matrix is supported const activeIndex = this.index(); - const ignoreLast = opt.WS_IGNORE_LAST && !Main.overview._shown ? 1 : 0; + const ignoreLast = opt.WS_IGNORE_LAST && Meta.prefs_get_dynamic_workspaces() && !Main.overview._shown ? 1 : 0; const wraparound = opt.WS_WRAPAROUND; const nWorkspaces = global.workspace_manager.n_workspaces; const lastIndex = nWorkspaces - 1 - ignoreLast; diff --git a/extensions/45/vertical-workspaces/lib/appDisplay.js b/extensions/45/vertical-workspaces/lib/appDisplay.js index 22640c6..c33cf0d 100644 --- a/extensions/45/vertical-workspaces/lib/appDisplay.js +++ b/extensions/45/vertical-workspaces/lib/appDisplay.js @@ -3,7 +3,7 @@ * appDisplay.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -34,6 +34,8 @@ let _timeouts; const APP_ICON_TITLE_EXPAND_TIME = 200; const APP_ICON_TITLE_COLLAPSE_TIME = 100; +const shellVersion46 = !Clutter.Container; // Container has been removed in 46 + function _getCategories(info) { let categoriesStr = info.get_categories(); if (!categoriesStr) @@ -187,7 +189,6 @@ export const AppDisplayModule = class { _setAppDisplayOrientation(vertical = false) { const CLUTTER_ORIENTATION = vertical ? Clutter.Orientation.VERTICAL : Clutter.Orientation.HORIZONTAL; - const scroll = vertical ? 'vscroll' : 'hscroll'; // app display to vertical has issues - page indicator not working // global appDisplay orientation switch is not built-in let appDisplay = Main.overview._overview._controls._appDisplay; @@ -247,7 +248,9 @@ export const AppDisplayModule = class { } // value for page indicator is calculated from scroll adjustment, horizontal needs to be replaced by vertical - appDisplay._adjustment = appDisplay._scrollView[scroll].adjustment; + appDisplay._adjustment = vertical + ? appDisplay._scrollView.get_vscroll_bar().adjustment + : appDisplay._scrollView.get_hscroll_bar().adjustment; // no need to connect already connected signal (wasn't removed the original one before) if (!vertical) { @@ -754,7 +757,7 @@ const BaseAppViewVertical = { this._nextPageArrow.scale_x = 0; this._prevPageArrow.scale_x = 0; - this._adjustment = this._scrollView.vscroll.adjustment; + this._adjustment = this._scrollView.get_vscroll_bar().adjustment; this._adjustment.connect('notify::value', adj => { const value = adj.value / adj.page_size; @@ -972,12 +975,17 @@ const FolderIcon = { : St.ButtonMask.ONE | St.ButtonMask.TWO; this.button_mask = buttonMask;*/ this.button_mask = St.ButtonMask.ONE | St.ButtonMask.TWO; + if (shellVersion46) + this.add_style_class_name('app-folder-46'); + else + this.add_style_class_name('app-folder-45'); }, open() { this._ensureFolderDialog(); + this._dialog._updateFolderSize(); // always open folder with the first page - this.view._scrollView.vscroll.adjustment.value = 0; + this.view._scrollView.get_vscroll_bar().adjustment.value = 0; this._dialog.popup(); }, }; @@ -1043,6 +1051,7 @@ const FolderView = { child._sourceItem = this._orderedItems[i]; child._sourceFolder = this; child.icon.style_class = ''; + child.set_style_class_name(''); child.icon.set_style('margin: 0; padding: 0;'); child._dot.set_style('margin-bottom: 1px;'); child.icon.setIconSize(subSize); @@ -1052,16 +1061,14 @@ const FolderView = { bin.connect('enter-event', () => { bin.ease({ duration: 100, - scale_x: 1.14, - scale_y: 1.14, + translation_y: -3, mode: Clutter.AnimationMode.EASE_OUT_QUAD, }); }); bin.connect('leave-event', () => { bin.ease({ duration: 100, - scale_x: 1, - scale_y: 1, + translation_y: 0, mode: Clutter.AnimationMode.EASE_OUT_QUAD, }); }); @@ -1072,8 +1079,8 @@ const FolderView = { } // if folder content changed, update folder size, but not if it's empty - if (this._dialog && this._dialog._designCapacity !== this._orderedItems.length && this._orderedItems.length) - this._dialog._updateFolderSize(); + /* if (this._dialog && this._dialog._designCapacity !== this._orderedItems.length && this._orderedItems.length) + this._dialog._updateFolderSize();*/ return icon; }, @@ -1201,6 +1208,11 @@ const AppFolderDialog = { // injection to _init() after__init() { this._viewBox.add_style_class_name('app-folder-dialog-vshell'); + // GS 46 changed the aligning to CENTER which restricts max folder dialog size + this._viewBox.set({ + x_align: Clutter.ActorAlign.FILL, + y_align: Clutter.ActorAlign.FILL, + }); // delegate this dialog to the FolderIcon._view // so its _createFolderIcon function can update the dialog if folder content changed @@ -1224,9 +1236,14 @@ const AppFolderDialog = { }, after__addFolderNameEntry() { + // edit-folder-button class has been replaced with icon-button class which is not transparent in 46 + this._editButton.add_style_class_name('edit-folder-button'); + if (shellVersion46) + this._editButton.add_style_class_name('edit-folder-button-46'); + // Edit button this._removeButton = new St.Button({ - style_class: 'edit-folder-button', + style_class: 'icon-button edit-folder-button', button_mask: St.ButtonMask.ONE, toggle_mode: false, reactive: true, diff --git a/extensions/45/vertical-workspaces/lib/appFavorites.js b/extensions/45/vertical-workspaces/lib/appFavorites.js index 94f67e2..977e65a 100644 --- a/extensions/45/vertical-workspaces/lib/appFavorites.js +++ b/extensions/45/vertical-workspaces/lib/appFavorites.js @@ -3,7 +3,7 @@ * appFavorites.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/dash.js b/extensions/45/vertical-workspaces/lib/dash.js index f26151d..719c3de 100644 --- a/extensions/45/vertical-workspaces/lib/dash.js +++ b/extensions/45/vertical-workspaces/lib/dash.js @@ -3,10 +3,9 @@ * dash.js * * @author GdH <G-dH@github.com> - * @copyright 2022-2023 + * @copyright 2022-2024 * @license GPL-3.0 - * modified dash module of https://github.com/RensAlthuis/vertical-overview extension - */ + */ 'use strict'; @@ -23,7 +22,6 @@ import * as AppFavorites from 'resource:///org/gnome/shell/ui/appFavorites.js'; import * as AppMenu from 'resource:///org/gnome/shell/ui/appMenu.js'; import * as BoxPointer from 'resource:///org/gnome/shell/ui/boxpointer.js'; import * as DND from 'resource:///org/gnome/shell/ui/dnd.js'; -import * as IconGrid from 'resource:///org/gnome/shell/ui/iconGrid.js'; import * as PopupMenu from 'resource:///org/gnome/shell/ui/popupMenu.js'; let Me; @@ -39,6 +37,8 @@ export const BaseIconSizes = [16, 24, 32, 40, 44, 48, 56, 64, 72, 80, 96, 112, 1 const DASH_ITEM_LABEL_SHOW_TIME = 150; +const shellVersion46 = !Clutter.Container; // Container has been removed in 46 + export const DashModule = class { constructor(me) { Me = me; @@ -130,32 +130,53 @@ export const DashModule = class { this._overrides.addOverride('DashIcon', Dash.DashIcon.prototype, DashIconCommon); this._overrides.addOverride('AppMenu', AppMenu.AppMenu.prototype, AppMenuCommon); + if (shellVersion46) + dash.add_style_class_name('dash-46'); + if (opt.DASH_VERTICAL) { // this._overrides.addOverride('Dash', Dash.Dash.prototype, DashVerticalOverride); - dash.add_style_class_name('vertical'); + dash.add_style_class_name(shellVersion46 + ? 'vertical-46' + : 'vertical' + ); this._setOrientation(Clutter.Orientation.VERTICAL); } else { this._setOrientation(Clutter.Orientation.HORIZONTAL); } + if (opt.DASH_VERTICAL && opt.DASH_BG_GS3_STYLE) { + if (opt.DASH_LEFT) { + dash.add_style_class_name(shellVersion46 + ? 'vertical-46-gs3-left' + : 'vertical-gs3-left'); + } else if (opt.DASH_RIGHT) { + dash.add_style_class_name(shellVersion46 + ? 'vertical-46-gs3-right' + : 'vertical-gs3-right'); + } + } else { + dash.remove_style_class_name('vertical-gs3-left'); + dash.remove_style_class_name('vertical-gs3-right'); + dash.remove_style_class_name('vertical-46-gs3-left'); + dash.remove_style_class_name('vertical-46-gs3-right'); + } + if (!this._customWorkId) this._customWorkId = Main.initializeDeferredWork(dash._box, dash._redisplay.bind(dash)); dash._workId = this._customWorkId; - this._updateSearchWindowsIcon(); - this._updateRecentFilesIcon(); - this._updateExtensionsIcon(); this._moveDashAppGridIcon(); this._connectShowAppsIcon(); dash.visible = opt.DASH_VISIBLE; - dash._background.add_style_class_name('dash-background-reduced'); + // dash._background.add_style_class_name('dash-background-reduced'); dash._queueRedisplay(); if (opt.DASH_ISOLATE_WS && !this._wmSwitchWsConId) { this._wmSwitchWsConId = global.windowManager.connect('switch-workspace', () => dash._queueRedisplay()); this._newWindowConId = global.display.connect_after('window-created', () => dash._queueRedisplay()); } + console.debug(' DashModule - Activated'); } @@ -181,9 +202,7 @@ export const DashModule = class { this._setOrientation(Clutter.Orientation.HORIZONTAL); this._moveDashAppGridIcon(reset); this._connectShowAppsIcon(reset); - this._updateSearchWindowsIcon(false); - this._updateRecentFilesIcon(false); - this._updateExtensionsIcon(false); + this._resetStyle(dash); dash.visible = !this._conflict; dash._background.opacity = 255; @@ -194,8 +213,11 @@ export const DashModule = class { _resetStyle(dash) { dash.remove_style_class_name('vertical'); + dash.remove_style_class_name('vertical-46'); dash.remove_style_class_name('vertical-gs3-left'); dash.remove_style_class_name('vertical-gs3-right'); + dash.remove_style_class_name('vertical-46-gs3-left'); + dash.remove_style_class_name('vertical-46-gs3-right'); dash.remove_style_class_name('vertical-left'); dash.remove_style_class_name('vertical-right'); dash._background.remove_style_class_name('dash-background-light'); @@ -237,16 +259,6 @@ export const DashModule = class { dash._separator = null; dash._queueRedisplay(); dash._adjustIconSize(); - - if (orientation && opt.DASH_BG_GS3_STYLE) { - if (opt.DASH_LEFT) - dash.add_style_class_name('vertical-gs3-left'); - else if (opt.DASH_RIGHT) - dash.add_style_class_name('vertical-gs3-right'); - } else { - dash.remove_style_class_name('vertical-gs3-left'); - dash.remove_style_class_name('vertical-gs3-right'); - } } _moveDashAppGridIcon(reset = false) { @@ -295,141 +307,6 @@ export const DashModule = class { dash._showAppsIcon.reactive = false; } } - - _updateSearchWindowsIcon(show = opt.SHOW_WINDOWS_ICON, dash) { - dash = dash ?? Main.overview._overview._controls.layoutManager._dash; - const dashContainer = dash._dashContainer; - - if (dash._showWindowsIcon) { - dashContainer.remove_child(dash._showWindowsIcon); - if (dash._showWindowsIconClickedId) { - dash._showWindowsIcon.toggleButton.disconnect(dash._showWindowsIconClickedId); - dash._showWindowsIconClickedId = 0; - } - delete dash._showWindowsIconClickedId; - if (dash._showWindowsIcon) - dash._showWindowsIcon.destroy(); - delete dash._showWindowsIcon; - } - - if (!show || !opt.get('windowSearchProviderModule')) - return; - - if (!dash._showWindowsIcon) { - dash._showWindowsIcon = new Dash.DashItemContainer(); - new Me.Util.Overrides().addOverride('showWindowsIcon', dash._showWindowsIcon, ShowWindowsIcon); - dash._showWindowsIcon._afterInit(); - dash._showWindowsIcon.show(false); - dashContainer.add_child(dash._showWindowsIcon); - dash._hookUpLabel(dash._showWindowsIcon); - } - - dash._showWindowsIcon.icon.setIconSize(dash.iconSize); - if (opt.SHOW_WINDOWS_ICON === 1) { - dashContainer.set_child_at_index(dash._showWindowsIcon, 0); - } else if (opt.SHOW_WINDOWS_ICON === 2) { - const index = dashContainer.get_children().length - 1; - dashContainer.set_child_at_index(dash._showWindowsIcon, index); - } - - Main.overview._overview._controls.layoutManager._dash._adjustIconSize(); - - if (dash._showWindowsIcon && !dash._showWindowsIconClickedId) { - dash._showWindowsIconClickedId = dash._showWindowsIcon.toggleButton.connect('clicked', () => { - Me.Util.activateSearchProvider(Me.WSP_PREFIX); - }); - } - } - - _updateRecentFilesIcon(show = opt.SHOW_RECENT_FILES_ICON, dash) { - dash = dash ?? Main.overview._overview._controls.layoutManager._dash; - const dashContainer = dash._dashContainer; - - if (dash._recentFilesIcon) { - dashContainer.remove_child(dash._recentFilesIcon); - if (dash._recentFilesIconClickedId) { - dash._recentFilesIcon.toggleButton.disconnect(dash._recentFilesIconClickedId); - dash._recentFilesIconClickedId = 0; - } - delete dash._recentFilesIconClickedId; - if (dash._recentFilesIcon) - dash._recentFilesIcon.destroy(); - delete dash._recentFilesIcon; - } - - if (!show || !opt.get('recentFilesSearchProviderModule')) - return; - - if (!dash._recentFilesIcon) { - dash._recentFilesIcon = new Dash.DashItemContainer(); - new Me.Util.Overrides().addOverride('recentFilesIcon', dash._recentFilesIcon, ShowRecentFilesIcon); - dash._recentFilesIcon._afterInit(); - dash._recentFilesIcon.show(false); - dashContainer.add_child(dash._recentFilesIcon); - dash._hookUpLabel(dash._recentFilesIcon); - } - - dash._recentFilesIcon.icon.setIconSize(dash.iconSize); - if (opt.SHOW_RECENT_FILES_ICON === 1) { - dashContainer.set_child_at_index(dash._recentFilesIcon, 0); - } else if (opt.SHOW_RECENT_FILES_ICON === 2) { - const index = dashContainer.get_children().length - 1; - dashContainer.set_child_at_index(dash._recentFilesIcon, index); - } - - Main.overview._overview._controls.layoutManager._dash._adjustIconSize(); - - if (dash._recentFilesIcon && !dash._recentFilesIconClickedId) { - dash._recentFilesIconClickedId = dash._recentFilesIcon.toggleButton.connect('clicked', () => { - Me.Util.activateSearchProvider(Me.RFSP_PREFIX); - }); - } - } - - _updateExtensionsIcon(show = opt.SHOW_EXTENSIONS_ICON, dash) { - dash = dash ?? Main.overview._overview._controls.layoutManager._dash; - const dashContainer = dash._dashContainer; - - if (dash._extensionsIcon) { - dashContainer.remove_child(dash._extensionsIcon); - if (dash._extensionsIconClickedId) { - dash._extensionsIcon.toggleButton.disconnect(dash._extensionsIconClickedId); - dash._extensionsIconClickedId = 0; - } - delete dash._extensionsIconClickedId; - if (dash._extensionsIcon) - dash._extensionsIcon.destroy(); - delete dash._extensionsIcon; - } - - if (!show || !opt.get('extensionsSearchProviderModule')) - return; - - if (!dash._extensionsIcon) { - dash._extensionsIcon = new Dash.DashItemContainer(); - new Me.Util.Overrides().addOverride('extensionsIcon', dash._extensionsIcon, ShowExtensionsIcon); - dash._extensionsIcon._afterInit(); - dash._extensionsIcon.show(false); - dashContainer.add_child(dash._extensionsIcon); - dash._hookUpLabel(dash._extensionsIcon); - } - - dash._extensionsIcon.icon.setIconSize(dash.iconSize); - if (opt.SHOW_EXTENSIONS_ICON === 1) { - dashContainer.set_child_at_index(dash._extensionsIcon, 0); - } else if (opt.SHOW_EXTENSIONS_ICON === 2) { - const index = dashContainer.get_children().length - 1; - dashContainer.set_child_at_index(dash._extensionsIcon, index); - } - - Main.overview._overview._controls.layoutManager._dash._adjustIconSize(); - - if (dash._extensionsIcon && !dash._extensionsIconClickedId) { - dash._extensionsIconClickedId = dash._extensionsIcon.toggleButton.connect('clicked', () => { - Me.Util.activateSearchProvider(Me.ESP_PREFIX); - }); - } - } }; function getAppFromSource(source) { @@ -475,20 +352,20 @@ const DashItemContainerCommon = { let y; if (opt.DASH_TOP) { - const yOffset = 0.75 * itemHeight + 3 * node.get_length('-y-offset'); + const yOffset = itemHeight + (shellVersion46 ? 0 : -3); y = stageY + yOffset; } else if (opt.DASH_BOTTOM) { const yOffset = node.get_length('-y-offset'); y = stageY - this.label.height - yOffset; } else if (opt.DASH_RIGHT) { const yOffset = Math.floor((itemHeight - labelHeight) / 2); - xOffset = 4; + xOffset = shellVersion46 ? 8 : 4; x = stageX - xOffset - this.label.width; y = Math.clamp(stageY + yOffset, 0, global.stage.height - labelHeight); } else if (opt.DASH_LEFT) { const yOffset = Math.floor((itemHeight - labelHeight) / 2); - xOffset = 4; + xOffset = shellVersion46 ? 8 : 4; x = stageX + this.width + xOffset; y = Math.clamp(stageY + yOffset, 0, global.stage.height - labelHeight); @@ -744,15 +621,15 @@ const DashCommon = { if (this._showAppsIcon.visible) iconChildren.push(this._showAppsIcon); + + // showWindowsIcon and extensionsIcon can be provided by the WSP and ESP extensions if (this._showWindowsIcon) iconChildren.push(this._showWindowsIcon); - if (this._recentFilesIcon) - iconChildren.push(this._recentFilesIcon); - if (this._extensionsIcon) iconChildren.push(this._extensionsIcon); + if (!iconChildren.length) return; @@ -967,12 +844,15 @@ const DashIconCommon = { this._scrollConId = this.connect('scroll-event', DashExtensions.onScrollEvent.bind(this)); this._leaveConId = this.connect('leave-event', DashExtensions.onLeaveEvent.bind(this)); } + + if (this._updateRunningDotStyle) + this._updateRunningDotStyle(); }, - popupMenu() { + /* popupMenu() { const side = opt.DASH_VERTICAL ? St.Side.LEFT : St.Side.BOTTOM; AppIconCommon.popupMenu.bind(this)(side); - }, + },*/ _updateRunningStyle() { const currentWs = global.workspace_manager.get_active_workspace(); @@ -985,193 +865,27 @@ const DashIconCommon = { else this._dot.hide(); }, -}; - -const DashExtensions = { - onScrollEvent(source, event) { - if ((this.app && !opt.DASH_ICON_SCROLL) || (this._isSearchWindowsIcon && !opt.SEARCH_WINDOWS_ICON_SCROLL)) { - if (this._scrollConId) { - this.disconnect(this._scrollConId); - this._scrollConId = 0; - } - if (this._leaveConId) { - this.disconnect(this._leaveConId); - this._leaveConId = 0; - } - return Clutter.EVENT_PROPAGATE; - } - - if (Main.overview._overview.controls._stateAdjustment.value > 1) - return Clutter.EVENT_PROPAGATE; - - let direction = Me.Util.getScrollDirection(event); - if (direction === Clutter.ScrollDirection.UP) - direction = 1; - else if (direction === Clutter.ScrollDirection.DOWN) - direction = -1; - else - return Clutter.EVENT_STOP; - - // avoid uncontrollable switching if smooth scroll wheel or trackpad is used - if (this._lastScroll && Date.now() - this._lastScroll < 160) - return Clutter.EVENT_STOP; - - this._lastScroll = Date.now(); - - DashExtensions.switchWindow.bind(this)(direction); - return Clutter.EVENT_STOP; - }, - - onLeaveEvent() { - if (!this._selectedMetaWin || this.has_pointer || this.toggleButton?.has_pointer) - return; - - this._selectedPreview._activateSelected = false; - this._selectedMetaWin = null; - this._scrolledWindows = null; - DashExtensions.showWindowPreview.bind(this)(null); - }, - - - switchWindow(direction) { - if (!this._scrolledWindows) { - this._initialSelection = true; - // source is app icon - if (this.app) { - this._scrolledWindows = this.app.get_windows(); - if (opt.DASH_ISOLATE_WS) { - const currentWs = global.workspaceManager.get_active_workspace(); - this._scrolledWindows = this._scrolledWindows.filter(w => w.get_workspace() === currentWs); - } - - const wsList = []; - this._scrolledWindows.forEach(w => { - const ws = w.get_workspace(); - if (!wsList.includes(ws)) - wsList.push(ws); - }); - - // sort windows by workspaces in MRU order - this._scrolledWindows.sort((a, b) => wsList.indexOf(a.get_workspace()) > wsList.indexOf(b.get_workspace())); - // source is Search Windows icon - } else if (this._isSearchWindowsIcon) { - if (opt.SEARCH_WINDOWS_ICON_SCROLL === 1) // all windows - this._scrolledWindows = Me.Util.getWindows(null); - else - this._scrolledWindows = Me.Util.getWindows(global.workspace_manager.get_active_workspace()); - } - } - - let windows = this._scrolledWindows; - - if (!windows.length) - return; - - // if window selection is in the process, the previewed window must be the current one - let currentWin = this._selectedMetaWin ? this._selectedMetaWin : windows[0]; - - const currentIdx = windows.indexOf(currentWin); - let targetIdx = currentIdx; - // const focusWindow = Me.Util.getWindows(null)[0]; // incompatible 45 - const focusWindow = Me.Util.getWindows(null)[0]; - const appFocused = this._scrolledWindows[0] === focusWindow && this._scrolledWindows[0].get_workspace() === global.workspace_manager.get_active_workspace(); - // only if the app has focus, immediately switch to the previous window - // otherwise just set the current window above others - if (!this._initialSelection || appFocused) - targetIdx += direction; - else - this._initialSelection = false; - - if (targetIdx > windows.length - 1) - targetIdx = 0; - else if (targetIdx < 0) - targetIdx = windows.length - 1; - - const metaWin = windows[targetIdx]; - DashExtensions.showWindowPreview.bind(this)(metaWin); - this._selectedMetaWin = metaWin; - }, - - showWindowPreview(metaWin) { - const views = Main.overview._overview.controls._workspacesDisplay._workspacesViews; - const viewsIter = [views[0]]; - // secondary monitors use different structure - views.forEach(v => { - if (v._workspacesView) - viewsIter.push(v._workspacesView); - }); - - viewsIter.forEach(view => { - // if workspaces are on primary monitor only - if (!view || !view._workspaces) - return; - - view._workspaces.forEach(ws => { - ws._windows.forEach(windowPreview => { - // metaWin === null resets opacity - let opacity = metaWin ? 50 : 255; - windowPreview._activateSelected = false; - - // minimized windows are invisible if windows are not exposed (WORKSPACE_MODE === 0) - if (!windowPreview.opacity) - windowPreview.opacity = 255; - - // app windows set to lower opacity, so they can be recognized - if (this._scrolledWindows && this._scrolledWindows.includes(windowPreview.metaWindow)) { - if (opt.DASH_ICON_SCROLL === 2) - opacity = 254; - } - if (windowPreview.metaWindow === metaWin) { - if (metaWin && metaWin.get_workspace() !== global.workspace_manager.get_active_workspace()) { - Main.wm.actionMoveWorkspace(metaWin.get_workspace()); - if (_timeouts.wsSwitcherAnimation) - GLib.source_remove(_timeouts.wsSwitcherAnimation); - // setting window preview above siblings before workspace switcher animation has no effect - // we need to set the window above after the ws preview become visible on the screen - // the default switcher animation time is 250, 200 ms delay should be enough - _timeouts.wsSwitcherAnimation = GLib.timeout_add(0, 200 * St.Settings.get().slow_down_factor, () => { - windowPreview.get_parent().set_child_above_sibling(windowPreview, null); - _timeouts.wsSwitcherAnimation = 0; - return GLib.SOURCE_REMOVE; - }); - } else { - windowPreview.get_parent().set_child_above_sibling(windowPreview, null); - } - - opacity = 255; - this._selectedPreview = windowPreview; - windowPreview._activateSelected = true; - } - - // if windows are exposed, highlight selected using opacity - if ((opt.OVERVIEW_MODE && opt.WORKSPACE_MODE) || !opt.OVERVIEW_MODE) { - if (metaWin && opacity === 255) - windowPreview.showOverlay(true); - else - windowPreview.hideOverlay(true); - windowPreview.ease({ - duration: 200, - opacity, - mode: Clutter.AnimationMode.EASE_OUT_QUAD, - }); - } - }); - }); - }); - }, -}; -const AppIconCommon = { - after__init() { + /* after__init() { if (this._updateRunningDotStyle) this._updateRunningDotStyle(); - }, + },*/ _updateRunningDotStyle() { if (opt.RUNNING_DOT_STYLE) this._dot.add_style_class_name('app-well-app-running-dot-custom'); else this._dot.remove_style_class_name('app-well-app-running-dot-custom'); + + if (!this.label && shellVersion46) { + if (opt.DASH_VERTICAL) { + this._dot.translation_y = 0; + this._dot.translation_x = 0; // opt.DASH_LEFT ? -4 : 4; + } else { + this._dot.translation_y = 8; + this._dot.translation_x = 0; + } + } }, activate(button) { @@ -1243,6 +957,9 @@ const AppIconCommon = { }, popupMenu(side = St.Side.LEFT) { + side = opt.DASH_VERTICAL ? St.Side.LEFT : St.Side.BOTTOM; + // AppIconCommon.popupMenu.bind(this)(side); + this.setForcedHighlight(true); this._removeMenuTimeout(); this.fake_release(); @@ -1277,7 +994,7 @@ const AppIconCommon = { this._hidingSigId = Main.overview.connect('hiding', () => this._menu.close(), this); - Main.uiGroup.add_actor(this._menu.actor); + Main.uiGroup.add_child(this._menu.actor); this._menuManager.addMenu(this._menu); } @@ -1310,10 +1027,12 @@ const AppIconCommon = { }]); } + popupItems.push([_('Move App to Current Workspace ( Shift + Click )'), this._moveAppToCurrentWorkspace]); - if (opt.WINDOW_THUMBNAIL_ENABLED) { - popupItems.push([_('Create Window Thumbnail - PIP'), () => { - Me.Modules.winTmbModule.createThumbnail(this.app.get_windows()[0]); + // WTMB (Windows Thumbnails) extension required + if (global.windowThumbnails) { + popupItems.push([_('Create Window Thumbnail/PiP'), () => { + global.windowThumbnails?.createThumbnail(this.app.get_windows()[0]); }]); } } @@ -1362,115 +1081,191 @@ const AppIconCommon = { }, }; -const ShowWindowsIcon = { - _afterInit() { - this._isSearchWindowsIcon = true; - this._labelText = _('Search Open Windows (Hotkey: Space)'); - this.toggleButton = new St.Button({ - style_class: 'show-apps', - track_hover: true, - can_focus: true, - toggle_mode: false, - }); +const DashExtensions = { + onScrollEvent(source, event) { + if ((this.app && !opt.DASH_ICON_SCROLL) || (this._isSearchWindowsIcon && !opt.SEARCH_WINDOWS_ICON_SCROLL)) { + if (this._scrollConId) { + this.disconnect(this._scrollConId); + this._scrollConId = 0; + } + if (this._leaveConId) { + this.disconnect(this._leaveConId); + this._leaveConId = 0; + } + return Clutter.EVENT_PROPAGATE; + } - this._iconActor = null; - this.icon = new IconGrid.BaseIcon(this.labelText, { - setSizeManually: true, - showLabel: false, - createIcon: this._createIcon.bind(this), - }); - this.icon.y_align = Clutter.ActorAlign.CENTER; + if (Main.overview._overview.controls._stateAdjustment.value > 1) + return Clutter.EVENT_PROPAGATE; - this.toggleButton.add_actor(this.icon); - this.toggleButton._delegate = this; + let direction = Me.Util.getScrollDirection(event); + if (direction === Clutter.ScrollDirection.UP) + direction = 1; + else if (direction === Clutter.ScrollDirection.DOWN) + direction = -1; + else + return Clutter.EVENT_STOP; - this.setChild(this.toggleButton); + // avoid uncontrollable switching if smooth scroll wheel or trackpad is used + if (this._lastScroll && Date.now() - this._lastScroll < 160) + return Clutter.EVENT_STOP; - if (opt.SEARCH_WINDOWS_ICON_SCROLL) { - this.reactive = true; - this._scrollConId = this.connect('scroll-event', DashExtensions.onScrollEvent.bind(this)); - this._leaveConId = this.connect('leave-event', DashExtensions.onLeaveEvent.bind(this)); - } + this._lastScroll = Date.now(); + + DashExtensions.switchWindow.bind(this)(direction); + return Clutter.EVENT_STOP; }, - _createIcon(size) { - this._iconActor = new St.Icon({ - icon_name: 'focus-windows-symbolic', - icon_size: size, - style_class: 'show-apps-icon', - track_hover: true, - }); - return this._iconActor; + onLeaveEvent() { + if (!this._selectedMetaWin || this.has_pointer || this.toggleButton?.has_pointer) + return; + + this._selectedPreview._activateSelected = false; + this._selectedMetaWin = null; + this._scrolledWindows = null; + DashExtensions.showWindowPreview.bind(this)(null); }, -}; -const ShowRecentFilesIcon = { - _afterInit() { - this._labelText = _('Search Recent Files (Hotkey: Ctrl + Space)'); - this.toggleButton = new St.Button({ - style_class: 'show-apps', - track_hover: true, - can_focus: true, - toggle_mode: false, - }); - this._iconActor = null; - this.icon = new IconGrid.BaseIcon(this.labelText, { - setSizeManually: true, - showLabel: false, - createIcon: this._createIcon.bind(this), - }); - this.icon.y_align = Clutter.ActorAlign.CENTER; + switchWindow(direction) { + if (!this._scrolledWindows) { + this._initialSelection = true; + // source is app icon + if (this.app) { + this._scrolledWindows = this.app.get_windows(); + if (opt.DASH_ISOLATE_WS) { + const currentWs = global.workspaceManager.get_active_workspace(); + this._scrolledWindows = this._scrolledWindows.filter(w => w.get_workspace() === currentWs); + } - this.toggleButton.add_actor(this.icon); - this.toggleButton._delegate = this; + const wsList = []; + this._scrolledWindows.forEach(w => { + const ws = w.get_workspace(); + if (!wsList.includes(ws)) + wsList.push(ws); + }); - this.setChild(this.toggleButton); - }, + // sort windows by workspaces in MRU order + this._scrolledWindows.sort((a, b) => wsList.indexOf(a.get_workspace()) > wsList.indexOf(b.get_workspace())); + // source is Search Windows icon + } else if (this._isSearchWindowsIcon) { + if (opt.SEARCH_WINDOWS_ICON_SCROLL === 1) // all windows + this._scrolledWindows = Me.Util.getWindows(null); + else + this._scrolledWindows = Me.Util.getWindows(global.workspace_manager.get_active_workspace()); + } + } - _createIcon(size) { - this._iconActor = new St.Icon({ - icon_name: 'document-open-recent-symbolic', - icon_size: size, - style_class: 'show-apps-icon', - track_hover: true, - }); - return this._iconActor; + let windows = this._scrolledWindows; + + if (!windows.length) + return; + + // if window selection is in the process, the previewed window must be the current one + let currentWin = this._selectedMetaWin ? this._selectedMetaWin : windows[0]; + + const currentIdx = windows.indexOf(currentWin); + let targetIdx = currentIdx; + // const focusWindow = Me.Util.getWindows(null)[0]; // incompatible 45 + const focusWindow = Me.Util.getWindows(null)[0]; + const appFocused = this._scrolledWindows[0] === focusWindow && this._scrolledWindows[0].get_workspace() === global.workspace_manager.get_active_workspace(); + // only if the app has focus, immediately switch to the previous window + // otherwise just set the current window above others + if (!this._initialSelection || appFocused) + targetIdx += direction; + else + this._initialSelection = false; + + if (targetIdx > windows.length - 1) + targetIdx = 0; + else if (targetIdx < 0) + targetIdx = windows.length - 1; + + const metaWin = windows[targetIdx]; + DashExtensions.showWindowPreview.bind(this)(metaWin); + this._selectedMetaWin = metaWin; }, -}; -const ShowExtensionsIcon = { - _afterInit() { - this._labelText = _('Search Extensions (Hotkey: Ctrl + Shift + Space)'); - this.toggleButton = new St.Button({ - style_class: 'show-apps', - track_hover: true, - can_focus: true, - toggle_mode: false, + showWindowPreview(metaWin) { + const views = Main.overview._overview.controls._workspacesDisplay._workspacesViews; + const viewsIter = [views[0]]; + // secondary monitors use different structure + views.forEach(v => { + if (v._workspacesView) + viewsIter.push(v._workspacesView); }); - this._iconActor = null; - this.icon = new IconGrid.BaseIcon(this.labelText, { - setSizeManually: true, - showLabel: false, - createIcon: this._createIcon.bind(this), - }); - this.icon.y_align = Clutter.ActorAlign.CENTER; + viewsIter.forEach(view => { + // if workspaces are on primary monitor only + if (!view || !view._workspaces) + return; - this.toggleButton.add_actor(this.icon); - this.toggleButton._delegate = this; + view._workspaces.forEach(ws => { + ws._windows.forEach(windowPreview => { + // metaWin === null resets opacity + let opacity = metaWin ? 50 : 255; + windowPreview._activateSelected = false; - this.setChild(this.toggleButton); - }, + // minimized windows are invisible if windows are not exposed (WORKSPACE_MODE === 0) + if (!windowPreview.opacity) + windowPreview.opacity = 255; + + // app windows set to lower opacity, so they can be recognized + if (this._scrolledWindows && this._scrolledWindows.includes(windowPreview.metaWindow)) { + if (opt.DASH_ICON_SCROLL === 2) + opacity = 254; + } + if (windowPreview.metaWindow === metaWin) { + if (metaWin && metaWin.get_workspace() !== global.workspace_manager.get_active_workspace()) { + Main.wm.actionMoveWorkspace(metaWin.get_workspace()); + if (_timeouts.wsSwitcherAnimation) + GLib.source_remove(_timeouts.wsSwitcherAnimation); + // setting window preview above siblings before workspace switcher animation has no effect + // we need to set the window above after the ws preview become visible on the screen + // the default switcher animation time is 250, 200 ms delay should be enough + _timeouts.wsSwitcherAnimation = GLib.timeout_add(0, 200 * St.Settings.get().slow_down_factor, () => { + windowPreview.get_parent().set_child_above_sibling(windowPreview, null); + _timeouts.wsSwitcherAnimation = 0; + return GLib.SOURCE_REMOVE; + }); + } else { + windowPreview.get_parent().set_child_above_sibling(windowPreview, null); + } - _createIcon(size) { - this._iconActor = new St.Icon({ - icon_name: 'application-x-addon-symbolic', - icon_size: size, - style_class: 'show-apps-icon', - track_hover: true, + opacity = 255; + this._selectedPreview = windowPreview; + windowPreview._activateSelected = true; + } + + // if windows are exposed, highlight selected using opacity + if ((opt.OVERVIEW_MODE && opt.WORKSPACE_MODE) || !opt.OVERVIEW_MODE) { + if (metaWin && opacity === 255) + windowPreview.showOverlay(true); + else + windowPreview.hideOverlay(true); + windowPreview.ease({ + duration: 200, + opacity, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + }); + }); }); - return this._iconActor; + }, +}; + +const AppIconCommon = { + after__init() { + if (this._updateRunningDotStyle) + this._updateRunningDotStyle(); + }, + + _updateRunningDotStyle() { + if (opt.RUNNING_DOT_STYLE) + this._dot.add_style_class_name('app-well-app-running-dot-custom'); + else + this._dot.remove_style_class_name('app-well-app-running-dot-custom'); }, }; diff --git a/extensions/45/vertical-workspaces/lib/extensionsSearchProvider.js b/extensions/45/vertical-workspaces/lib/extensionsSearchProvider.js deleted file mode 100644 index 30d9960..0000000 --- a/extensions/45/vertical-workspaces/lib/extensionsSearchProvider.js +++ /dev/null @@ -1,406 +0,0 @@ -/** -* V-Shell (Vertical Workspaces) - * extensionsSearchProvider.js - * - * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 - * @license GPL-3.0 - */ - -'use strict'; - -import GLib from 'gi://GLib'; -import St from 'gi://St'; -import Gio from 'gi://Gio'; -import Shell from 'gi://Shell'; -import GObject from 'gi://GObject'; -import Clutter from 'gi://Clutter'; - -import * as Main from 'resource:///org/gnome/shell/ui/main.js'; - -const ExtensionState = { - 1: 'ENABLED', - 2: 'DISABLED', - 3: 'ERROR', - 4: 'INCOMPATIBLE', - 5: 'DOWNLOADING', - 6: 'INITIALIZED', - 7: 'DISABLING', - 8: 'ENABLING', -}; - -let Me; -let opt; -// gettext -let _; -let _toggleTimeout; - -// prefix helps to eliminate results from other search providers -// so it needs to be something less common -// needs to be accessible from vw module -export const PREFIX = 'eq//'; - -export class ExtensionsSearchProviderModule { - // export for other modules - static _PREFIX = PREFIX; - constructor(me) { - Me = me; - opt = Me.opt; - _ = Me.gettext; - - this._firstActivation = true; - this.moduleEnabled = false; - this._extensionsSearchProvider = null; - this._enableTimeoutId = 0; - } - - cleanGlobals() { - Me = null; - opt = null; - _ = null; - } - - update(reset) { - if (_toggleTimeout) - GLib.source_remove(_toggleTimeout); - - this.moduleEnabled = opt.get('extensionsSearchProviderModule'); - - reset = reset || !this.moduleEnabled; - - if (reset && !this._firstActivation) { - this._disableModule(); - } else if (!reset) { - this._firstActivation = false; - this._activateModule(); - } - if (reset && this._firstActivation) - console.debug(' ExtensionsSearchProviderModule - Keeping untouched'); - } - - _activateModule() { - // delay because Fedora had problem to register a new provider soon after Shell restarts - this._enableTimeoutId = GLib.timeout_add( - GLib.PRIORITY_DEFAULT, - 2000, - () => { - if (!this._extensionsSearchProvider) { - this._extensionsSearchProvider = new extensionsSearchProvider(opt); - this._getOverviewSearchResult()._registerProvider(this._extensionsSearchProvider); - } - this._enableTimeoutId = 0; - return GLib.SOURCE_REMOVE; - } - ); - console.debug(' ExtensionsSearchProviderModule - Activated'); - } - - _disableModule() { - if (this._enableTimeoutId) { - GLib.source_remove(this._enableTimeoutId); - this._enableTimeoutId = 0; - } - - if (this._extensionsSearchProvider) { - this._getOverviewSearchResult()._unregisterProvider(this._extensionsSearchProvider); - this._extensionsSearchProvider = null; - } - - - console.debug(' ExtensionsSearchProviderModule - Disabled'); - } - - _getOverviewSearchResult() { - return Main.overview._overview.controls._searchController._searchResults; - } -} - -class extensionsSearchProvider { - constructor() { - this.id = 'extensions'; - const appSystem = Shell.AppSystem.get_default(); - let appInfo = appSystem.lookup_app('com.matjakeman.ExtensionManager.desktop')?.get_app_info(); - if (!appInfo) - appInfo = appSystem.lookup_app('org.gnome.Extensions.desktop')?.get_app_info(); - if (!appInfo) - appInfo = Gio.AppInfo.create_from_commandline('/usr/bin/gnome-extensions-app', 'Extensions', null); - appInfo.get_description = () => _('Search extensions'); - appInfo.get_name = () => _('Extensions'); - appInfo.get_id = () => 'org.gnome.Extensions.desktop'; - appInfo.get_icon = () => Gio.icon_new_for_string('application-x-addon'); - appInfo.should_show = () => true; - - this.appInfo = appInfo; - this.canLaunchSearch = true; - this.isRemoteProvider = false; - } - - getInitialResultSet(terms/* , callback*/) { - const extensions = {}; - Main.extensionManager._extensions.forEach( - e => { - extensions[e.uuid] = e; - } - ); - this.extensions = extensions; - - return new Promise(resolve => resolve(this._getResultSet(terms))); - } - - _getResultSet(terms) { - // do not modify original terms - let termsCopy = [...terms]; - // search for terms without prefix - termsCopy[0] = termsCopy[0].replace(PREFIX, ''); - - const candidates = this.extensions; - const _terms = [].concat(termsCopy); - - const term = _terms.join(' '); - - const results = []; - let m; - for (let id in candidates) { - const extension = this.extensions[id]; - const text = extension.metadata.name + (extension.state === 1 ? 'enabled' : '') + ([6, 2].includes(extension.state) ? 'disabled' : ''); - if (opt.SEARCH_FUZZY) - m = Me.Util.fuzzyMatch(term, text); - else - m = Me.Util.strictMatch(term, text); - - if (m !== -1) - results.push({ weight: m, id }); - } - - // sort alphabetically - results.sort((a, b) => this.extensions[a.id].metadata.name.localeCompare(this.extensions[b.id].metadata.name)); - // enabled first - // results.sort((a, b) => this.extensions[a.id].state !== 1 && this.extensions[b.id].state === 1); - // incompatible last - results.sort((a, b) => this.extensions[a.id].state === 4 && this.extensions[b.id].state !== 4); - - const resultIds = results.map(item => item.id); - return resultIds; - } - - getResultMetas(resultIds/* , callback = null*/) { - const metas = resultIds.map(id => this.getResultMeta(id)); - return new Promise(resolve => resolve(metas)); - } - - getResultMeta(resultId) { - const result = this.extensions[resultId]; - - const versionName = result.metadata['version-name'] ?? ''; - let version = result.metadata['version'] ?? ''; - version = versionName && version ? `/${version}` : version; - const versionStr = `${versionName}${version}`; - - return { - 'id': resultId, - 'name': `${result.metadata.name}`, - 'version': versionStr, - 'description': versionStr, // description will be updated in result object - 'createIcon': size => { - let icon = this.getIcon(result, size); - return icon; - }, - }; - } - - getIcon(extension, size) { - let opacity = 0; - let iconName = 'process-stop-symbolic'; - - switch (extension.state) { - case 1: - if (extension.hasUpdate) - iconName = 'software-update-available'; // 'software-update-available-symbolic'; - else - iconName = 'object-select-symbolic';// 'object-select-symbolic'; - - opacity = 255; - break; - case 3: - if (Main.extensionManager._enabledExtensions.includes(extension.uuid)) - iconName = 'emblem-ok-symbolic'; - else - iconName = 'dialog-error'; - opacity = 100; - break; - case 4: - iconName = 'software-update-urgent'; // 'software-update-urgent-symbolic'; - opacity = 100; - break; - } - - if (extension.hasUpdate) { - iconName = 'software-update-available'; // 'software-update-available-symbolic'; - opacity = 100; - } - - const icon = new St.Icon({ icon_name: iconName, icon_size: size }); - icon.set({ - opacity, - }); - - return icon; - } - - createResultObject(meta) { - return new ListSearchResult(this, meta, this.extensions[meta.id]); - } - - launchSearch(terms, timeStamp) { - this.appInfo.launch([], global.create_app_launch_context(timeStamp, -1), null); - } - - activateResult(resultId/* terms, timeStamp*/) { - const extension = this.extensions[resultId]; - if (Me.Util.isShiftPressed()) - this._toggleExtension(extension); - else if (extension.hasPrefs) - Me.Util.openPreferences(extension.metadata); - } - - filterResults(results /* , maxResults*/) { - // return results.slice(0, maxResults); - return results; - } - - getSubsearchResultSet(previousResults, terms/* , callback*/) { - return this.getInitialResultSet(terms); - } - - getSubsearchResultSet42(terms, callback) { - callback(this._getResultSet(terms)); - } -} - -const ListSearchResult = GObject.registerClass( -class ListSearchResult extends St.Button { - _init(provider, metaInfo, extension) { - this.provider = provider; - this.metaInfo = metaInfo; - this.extension = extension; - - super._init({ - reactive: true, - can_focus: true, - track_hover: true, - }); - - this.style_class = 'list-search-result'; - - let content = new St.BoxLayout({ - style_class: 'list-search-result-content', - vertical: false, - x_align: Clutter.ActorAlign.START, - x_expand: true, - y_expand: true, - }); - this.set_child(content); - - let titleBox = new St.BoxLayout({ - style_class: 'list-search-result-title', - y_align: Clutter.ActorAlign.CENTER, - }); - - content.add_child(titleBox); - - // An icon for, or thumbnail of, content - let icon = this.metaInfo['createIcon'](this.ICON_SIZE); - let iconBox = new St.Button(); - iconBox.set_child(icon); - titleBox.add(iconBox); - iconBox.set_style('border: 1px solid rgba(200,200,200,0.2); padding: 2px; border-radius: 8px;'); - this._iconBox = iconBox; - this.icon = icon; - - iconBox.connect('clicked', () => { - this._toggleExtension(); - return Clutter.EVENT_STOP; - }); - - let title = new St.Label({ - text: this.metaInfo['name'], - y_align: Clutter.ActorAlign.CENTER, - opacity: extension.hasPrefs ? 255 : 150, - }); - titleBox.add_child(title); - - this.label_actor = title; - - this._descriptionLabel = new St.Label({ - style_class: 'list-search-result-description', - y_align: Clutter.ActorAlign.CENTER, - }); - content.add_child(this._descriptionLabel); - - this._highlightTerms(); - - this.connect('destroy', () => { - if (_toggleTimeout) { - GLib.source_remove(_toggleTimeout); - _toggleTimeout = 0; - } - }); - } - - _toggleExtension() { - const state = this.extension.state; - if (![1, 2, 6, 3].includes(state) || this.extension.metadata.name.includes('vertical-workspaces')) - return; - - if ([2, 6].includes(state)) - Main.extensionManager.enableExtension(this.extension.uuid); - else if ([1, 3].includes(state)) - Main.extensionManager.disableExtension(this.extension.uuid); - - if (_toggleTimeout) - GLib.source_remove(_toggleTimeout); - - _toggleTimeout = GLib.timeout_add(GLib.PRIORITY_LOW, 200, - () => { - if ([7, 8].includes(this.extension.state)) - return GLib.SOURCE_CONTINUE; - - this.icon?.destroy(); - this.icon = this.metaInfo['createIcon'](this.ICON_SIZE); - this._iconBox.set_child(this.icon); - this._highlightTerms(); - - _toggleTimeout = 0; - return GLib.SOURCE_REMOVE; - } - ); - } - - get ICON_SIZE() { - return 24; - } - - _highlightTerms() { - const extension = this.extension; - const state = extension.state === 4 ? ExtensionState[this.extension.state] : ''; - const error = extension.state === 3 ? ` ERROR: ${this.extension.error}` : ''; - const update = extension.hasUpdate ? ' | UPDATE PENDING' : ''; - const text = `${this.metaInfo.version} ${state}${error}${update}`; - let markup = text;// this.metaInfo['description'].split('\n')[0]; - this._descriptionLabel.clutter_text.set_markup(markup); - } - - vfunc_clicked() { - this.activate(); - } - - activate() { - this.provider.activateResult(this.metaInfo.id); - - if (this.metaInfo.clipboardText) { - St.Clipboard.get_default().set_text( - St.ClipboardType.CLIPBOARD, this.metaInfo.clipboardText); - } - Main.overview.toggle(); - } -}); diff --git a/extensions/45/vertical-workspaces/lib/iconGrid.js b/extensions/45/vertical-workspaces/lib/iconGrid.js index 09ec25e..87f6adb 100644 --- a/extensions/45/vertical-workspaces/lib/iconGrid.js +++ b/extensions/45/vertical-workspaces/lib/iconGrid.js @@ -3,7 +3,7 @@ * iconGrid.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/layout.js b/extensions/45/vertical-workspaces/lib/layout.js index d8f8fdc..807f9e0 100644 --- a/extensions/45/vertical-workspaces/lib/layout.js +++ b/extensions/45/vertical-workspaces/lib/layout.js @@ -3,7 +3,7 @@ * layout.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -127,23 +127,30 @@ const LayoutManagerCommon = { return; if (this.panelBox.height) { + const backend = !!Meta.Barrier.prototype.backend; + let params = {}; + if (backend) + params['backend'] = global.backend; + else + params['display'] = global.display; + let primary = this.primaryMonitor; if ([0, 1, 3].includes(opt.HOT_CORNER_POSITION)) { - this._rightPanelBarrier = new Meta.Barrier({ - display: global.display, + params = Object.assign({}, params, { x1: primary.x + primary.width, y1: this.panelBox.allocation.y1, x2: primary.x + primary.width, y2: this.panelBox.allocation.y2, directions: Meta.BarrierDirection.NEGATIVE_X, }); + this._rightPanelBarrier = new Meta.Barrier(params); } if ([2, 4].includes(opt.HOT_CORNER_POSITION)) { - this._leftPanelBarrier = new Meta.Barrier({ - display: global.display, + params = Object.assign({}, params, { x1: primary.x, y1: this.panelBox.allocation.y1, x2: primary.x, y2: this.panelBox.allocation.y2, directions: Meta.BarrierDirection.POSITIVE_X, }); + this._leftPanelBarrier = new Meta.Barrier(params); } } }, @@ -276,50 +283,65 @@ const HotCornerCommon = { const extendV = opt && opt.HOT_CORNER_ACTION && opt.HOT_CORNER_EDGE && opt.DASH_VERTICAL && monitor.index === primaryMonitor; const extendH = opt && opt.HOT_CORNER_ACTION && opt.HOT_CORNER_EDGE && !opt.DASH_VERTICAL && monitor.index === primaryMonitor; + const backend = !!Meta.Barrier.prototype.backend; + let params = {}; + if (backend) + params['backend'] = global.backend; + else + params['display'] = global.display; + if (opt.HOT_CORNER_POSITION <= 1) { - this._verticalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x, y1: this._y, y2: this._y + (extendV ? monitor.height : size), + params = Object.assign({}, params, { + x1: this._x, x2: this._x, + y1: this._y, y2: this._y + (extendV ? monitor.height : size), directions: Meta.BarrierDirection.POSITIVE_X, }); - this._horizontalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x + (extendH ? monitor.width : size), y1: this._y, y2: this._y, + this._verticalBarrier = new Meta.Barrier(params); + params = Object.assign({}, params, { + x1: this._x, x2: this._x + (extendH ? monitor.width : size), + y1: this._y, y2: this._y, directions: Meta.BarrierDirection.POSITIVE_Y, }); + this._horizontalBarrier = new Meta.Barrier(params); } else if (opt.HOT_CORNER_POSITION === 2) { - this._verticalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x, y1: this._y, y2: this._y + (extendV ? monitor.height : size), + params = Object.assign({}, params, { + x1: this._x, x2: this._x, + y1: this._y, y2: this._y + (extendV ? monitor.height : size), directions: Meta.BarrierDirection.NEGATIVE_X, }); - this._horizontalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x - size, x2: this._x, y1: this._y, y2: this._y, + this._verticalBarrier = new Meta.Barrier(params); + params = Object.assign({}, params, { + x1: this._x - size, x2: this._x, + y1: this._y, y2: this._y, directions: Meta.BarrierDirection.POSITIVE_Y, }); + this._horizontalBarrier = new Meta.Barrier(params); } else if (opt.HOT_CORNER_POSITION === 3) { - this._verticalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x, y1: this._y, y2: this._y - size, + params = Object.assign({}, params, { + x1: this._x, x2: this._x, + y1: this._y, y2: this._y - size, directions: Meta.BarrierDirection.POSITIVE_X, }); - this._horizontalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x + (extendH ? monitor.width : size), y1: this._y, y2: this._y, + this._verticalBarrier = new Meta.Barrier(params); + params = Object.assign({}, params, { + x1: this._x, x2: this._x + (extendH ? monitor.width : size), + y1: this._y, y2: this._y, directions: Meta.BarrierDirection.NEGATIVE_Y, }); + this._horizontalBarrier = new Meta.Barrier(params); } else if (opt.HOT_CORNER_POSITION === 4) { - this._verticalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x, y1: this._y, y2: this._y - size, + params = Object.assign({}, params, { + x1: this._x, x2: this._x, + y1: this._y, y2: this._y - size, directions: Meta.BarrierDirection.NEGATIVE_X, }); - this._horizontalBarrier = new Meta.Barrier({ - display: global.display, - x1: this._x, x2: this._x - size, y1: this._y, y2: this._y, + this._verticalBarrier = new Meta.Barrier(params); + params = Object.assign({}, params, { + x1: this._x, x2: this._x - size, + y1: this._y, y2: this._y, directions: Meta.BarrierDirection.NEGATIVE_Y, }); + this._horizontalBarrier = new Meta.Barrier(params); } this._pressureBarrier.addBarrier(this._verticalBarrier); @@ -431,7 +453,7 @@ const HotCornerCommon = { }, _toggleWindowSearchProvider() { - if (!Main.overview._overview._controls._searchController._searchActive) { + if (!Main.overview.searchController._searchActive) { opt.OVERVIEW_MODE = 2; opt.OVERVIEW_MODE2 = true; opt.WORKSPACE_MODE = 0; diff --git a/extensions/45/vertical-workspaces/lib/messageTray.js b/extensions/45/vertical-workspaces/lib/messageTray.js index 07f9541..28d6b1d 100644 --- a/extensions/45/vertical-workspaces/lib/messageTray.js +++ b/extensions/45/vertical-workspaces/lib/messageTray.js @@ -3,7 +3,7 @@ * messageTray.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/optionsFactory.js b/extensions/45/vertical-workspaces/lib/optionsFactory.js index c20885e..05e14b0 100644 --- a/extensions/45/vertical-workspaces/lib/optionsFactory.js +++ b/extensions/45/vertical-workspaces/lib/optionsFactory.js @@ -3,7 +3,7 @@ * optionsFactory.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 */ @@ -130,7 +130,7 @@ export const ItemFactory = class ItemFactory { for (let i = 0; i < options.length; i++) { const text = options[i][0]; const id = options[i][1]; - model.append(new DropDownItemVW({ text, id })); + model.append(new DropDownItem({ text, id })); if (id === currentValue) widget.set_selected(i); } @@ -205,7 +205,7 @@ export const ItemFactory = class ItemFactory { newDropDown() { const dropDown = new Gtk.DropDown({ model: new Gio.ListStore({ - item_type: DropDownItemVW, + item_type: DropDownItem, }), halign: Gtk.Align.END, valign: Gtk.Align.CENTER, @@ -457,8 +457,9 @@ export const AdwPrefs = class { } }; -const DropDownItemVW = GObject.registerClass({ - GTypeName: 'DropDownItemVW', +const DropDownItem = GObject.registerClass({ + // Registered name should be unique + GTypeName: `DropDownItem${Math.floor(Math.random() * 1000)}`, Properties: { 'text': GObject.ParamSpec.string( 'text', @@ -476,7 +477,7 @@ const DropDownItemVW = GObject.registerClass({ -2147483648, 2147483647, 0 ), }, -}, class DropDownItemVW extends GObject.Object { +}, class DropDownItem extends GObject.Object { get text() { return this._text; } diff --git a/extensions/45/vertical-workspaces/lib/osdWindow.js b/extensions/45/vertical-workspaces/lib/osdWindow.js index 2298c34..a06a331 100644 --- a/extensions/45/vertical-workspaces/lib/osdWindow.js +++ b/extensions/45/vertical-workspaces/lib/osdWindow.js @@ -3,7 +3,7 @@ * osdWindow.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/overlayKey.js b/extensions/45/vertical-workspaces/lib/overlayKey.js index 77264c1..5ffd973 100644 --- a/extensions/45/vertical-workspaces/lib/overlayKey.js +++ b/extensions/45/vertical-workspaces/lib/overlayKey.js @@ -3,7 +3,7 @@ * overlayKey.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -40,8 +40,10 @@ export const OverlayKeyModule = class { update(reset) { this.moduleEnabled = opt.get('overlayKeyModule'); const conflict = false; + // Avoid modifying the overlay key if its configuration is consistent with the GNOME default + const defaultConfig = opt.OVERVIEW_MODE === 0 && opt.OVERLAY_KEY_PRIMARY === 2 && opt.OVERLAY_KEY_SECONDARY === 1; - reset = reset || !this.moduleEnabled || conflict; + reset = reset || !this.moduleEnabled || conflict || defaultConfig; if (reset && !this._firstActivation) { this._disableModule(); @@ -135,7 +137,7 @@ export const OverlayKeyModule = class { opt.OVERVIEW_MODE2 = false; opt.WORKSPACE_MODE = 1; break; - case 3: // Default overview + case 3: // App grid if (Main.overview._shown) Main.overview.hide(); else diff --git a/extensions/45/vertical-workspaces/lib/overview.js b/extensions/45/vertical-workspaces/lib/overview.js index 449e9c8..30cc5db 100644 --- a/extensions/45/vertical-workspaces/lib/overview.js +++ b/extensions/45/vertical-workspaces/lib/overview.js @@ -3,7 +3,7 @@ * overview.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/overviewControls.js b/extensions/45/vertical-workspaces/lib/overviewControls.js index df5b371..41db47f 100644 --- a/extensions/45/vertical-workspaces/lib/overviewControls.js +++ b/extensions/45/vertical-workspaces/lib/overviewControls.js @@ -3,7 +3,7 @@ * overviewControls.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -118,7 +118,7 @@ export const OverviewControlsModule = class { } _replaceOnSearchChanged(reset) { - const searchController = Main.overview._overview.controls._searchController; + const searchController = Main.overview.searchController; if (reset) { if (_searchControllerSigId) { searchController.disconnect(_searchControllerSigId); @@ -128,8 +128,8 @@ export const OverviewControlsModule = class { searchController.unblock_signal_handler(_originalSearchControllerSigId); _originalSearchControllerSigId = 0; } - Main.overview._overview._controls.layoutManager._searchController._searchResults.translation_x = 0; - Main.overview._overview._controls.layoutManager._searchController._searchResults.translation_y = 0; + Main.overview.searchController._searchResults.translation_x = 0; + Main.overview.searchController._searchResults.translation_y = 0; Main.overview.searchEntry.visible = true; Main.overview.searchEntry.opacity = 255; } else { @@ -320,6 +320,9 @@ const ControlsManagerCommon = { }, _onSearchChanged() { + // something is somewhere setting the opacity to 0 if V-Shell is rebased while in overview / search + this._searchController.opacity = 255; + const { finalState, currentState } = this._stateAdjustment.getStateTransitionParams(); const { searchActive } = this._searchController; @@ -366,14 +369,12 @@ const ControlsManagerCommon = { this._searchController._searchResults.translation_x = 0; this._searchController._searchResults.translation_y = 0; - this._searchController.opacity = 255; this._searchController.visible = true; if (opt.SEARCH_VIEW_ANIMATION && ![4, 8].includes(opt.WS_TMB_POSITION)) { this._updateAppDisplayVisibility(); - this.layoutManager._searchController._searchResults._statusBin.opacity = 1; + this._searchController._searchResults._statusBin.opacity = 1; - this._searchController.opacity = searchActive ? 255 : 0; let translationX = 0; let translationY = 0; const geometry = global.display.get_monitor_geometry(global.display.get_primary_monitor()); @@ -407,6 +408,8 @@ const ControlsManagerCommon = { } this._searchController._searchResults.ease({ + delay: 150, // wait for results + opacity: searchActive ? 255 : 0, translation_x: searchActive ? 0 : translationX, translation_y: searchActive ? 0 : translationY, duration: SIDE_CONTROLS_ANIMATION_TIME, @@ -414,7 +417,7 @@ const ControlsManagerCommon = { onComplete: () => { this._searchController.visible = searchActive; this._searchTransition = false; - this.layoutManager._searchController._searchResults._statusBin.opacity = 255; + this._searchController._searchResults._statusBin.opacity = 255; }, }); @@ -431,10 +434,9 @@ const ControlsManagerCommon = { this._workspacesDisplay.setPrimaryWorkspaceVisible(true); - this._searchController.opacity = searchActive ? 0 : 255; - this._searchController.ease({ + this._searchController._searchResults.ease({ opacity: searchActive ? 255 : 0, - duration: searchActive ? SIDE_CONTROLS_ANIMATION_TIME : 0, + duration: searchActive ? SIDE_CONTROLS_ANIMATION_TIME / 2 : 0, mode: Clutter.AnimationMode.EASE_OUT_QUAD, onComplete: () => (this._searchController.visible = searchActive), }); @@ -442,10 +444,10 @@ const ControlsManagerCommon = { // reuse already tuned overview transition, just replace APP_GRID with the search view if (!(opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) && !Main.overview._animationInProgress && finalState !== ControlsState.HIDDEN && !this.dash.showAppsButton.checked) { - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.remove_style_class_name('search-section-content-bg-om2'); - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.add_style_class_name('search-section-content-bg'); - Main.overview.searchEntry.remove_style_class_name('search-entry-om2'); - const duration = opt.SEARCH_VIEW_ANIMATION ? 150 : 0; + this._searchController._searchResults._content.remove_style_class_name('search-section-content-bg-om2'); + this._searchController._searchResults._content.add_style_class_name('search-section-content-bg'); + this._searchEntry.remove_style_class_name('search-entry-om2'); + const duration = opt.SEARCH_VIEW_ANIMATION ? 140 : 0; this._stateAdjustment.ease(searchActive ? ControlsState.APP_GRID : ControlsState.WINDOW_PICKER, { // shorter animation time when entering search view can avoid stuttering in transition // collecting search results take some time and the problematic part is the realization of the object on the screen @@ -455,17 +457,20 @@ const ControlsManagerCommon = { mode: Clutter.AnimationMode.EASE_OUT_QUAD, onComplete: () => { this._workspacesDisplay.setPrimaryWorkspaceVisible(!searchActive); + // Set the delay before processing a new search entry to 150 on deactivation, so search providers can't make make the workspace animation stuttering + // set it back to 0 after in-animation, so the search can be snappy + opt.SEARCH_DELAY = searchActive || !opt.SEARCH_VIEW_ANIMATION ? 0 : 150; }, }); } else if (opt.OVERVIEW_MODE2 && !(opt.WORKSPACE_MODE || this.dash.showAppsButton.checked)) { // add background to search results and make searchEntry border thicker for better visibility - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.remove_style_class_name('search-section-content-bg'); - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.add_style_class_name('search-section-content-bg-om2'); + this._searchController._searchResults._content.remove_style_class_name('search-section-content-bg'); + this._searchController._searchResults._content.add_style_class_name('search-section-content-bg-om2'); Main.overview.searchEntry.add_style_class_name('search-entry-om2'); } else { - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.add_style_class_name('search-section-content-bg'); - Main.overview._overview._controls.layoutManager._searchController._searchResults._content.remove_style_class_name('search-section-content-bg-om2'); - Main.overview.searchEntry.remove_style_class_name('search-entry-om2'); + this._searchController._searchResults._content.add_style_class_name('search-section-content-bg'); + this._searchController._searchResults._content.remove_style_class_name('search-section-content-bg-om2'); + this._searchEntry.remove_style_class_name('search-entry-om2'); } }, @@ -662,7 +667,7 @@ const ControlsManagerCommon = { _getOverviewTranslations(dash, tmbBox, searchEntryBin) { // const tmbBox = Main.overview._overview._controls._thumbnailsBox; - const animationsDisabled = !St.Settings.get().enable_animations || (opt.SHOW_WS_PREVIEW_BG && !opt.OVERVIEW_MODE2); + const animationsDisabled = !St.Settings.get().enable_animations || ((opt.SHOW_WS_PREVIEW_BG && !opt.OVERVIEW_MODE2) && !Main.layoutManager._startingUp); if (animationsDisabled) return [0, 0, 0, 0, 0]; @@ -840,13 +845,16 @@ const ControlsManagerCommon = { if (!blurEffect) { blurEffect = new Shell.BlurEffect({ brightness: 1, - sigma: 0, mode: Shell.BlurMode.ACTOR, }); bgManager.backgroundActor.add_effect_with_name('blur', blurEffect); } - const searchActive = Main.overview._overview.controls._searchController.searchActive; + // In GNOME 46 the "sigma" property has been renamed to "radius" + const radius = blurEffect.sigma !== undefined ? 'sigma' : 'radius'; + blurEffect[radius] = 0; + + const searchActive = this._searchController.searchActive; if (searchActive) BRIGHTNESS = opt.SEARCH_BG_BRIGHTNESS; @@ -877,48 +885,61 @@ const ControlsManagerCommon = { const step = opt.SMOOTH_BLUR_TRANSITIONS ? 0.05 : 0.2; const progress = stateValue - (stateValue % step); if (opt.SHOW_WS_PREVIEW_BG && stateValue < 1 && !searchActive) { // no need to animate transition, unless appGrid state is involved, static bg is covered by the ws preview bg - if (blurEffect.sigma !== opt.OVERVIEW_BG_BLUR_SIGMA) - blurEffect.sigma = opt.OVERVIEW_BG_BLUR_SIGMA; + if (blurEffect[radius] !== opt.OVERVIEW_BG_BLUR_SIGMA) + blurEffect[radius] = opt.OVERVIEW_BG_BLUR_SIGMA; } else if (stateValue < 1 && !searchActive && !(opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE)) { const sigma = Math.round(Util.lerp(0, opt.OVERVIEW_BG_BLUR_SIGMA, progress)); - if (sigma !== blurEffect.sigma) - blurEffect.sigma = sigma; - } else if (stateValue < 1 && !searchActive && (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE && blurEffect.sigma)) { + if (sigma !== blurEffect[radius]) + blurEffect[radius] = sigma; + } else if (stateValue < 1 && !searchActive && (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE && blurEffect[radius])) { const sigma = Math.round(Util.lerp(0, opt.OVERVIEW_BG_BLUR_SIGMA, progress)); - if (sigma !== blurEffect.sigma) - blurEffect.sigma = sigma; + if (sigma !== blurEffect[radius]) + blurEffect[radius] = sigma; } else if (stateValue > 1 && !searchActive && (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE && finalState === 1)) { const sigma = Math.round(Util.lerp(0, opt.OVERVIEW_BG_BLUR_SIGMA, progress % 1)); - if (sigma !== blurEffect.sigma) - blurEffect.sigma = sigma; + if (sigma !== blurEffect[radius]) + blurEffect[radius] = sigma; } else if ((stateValue > 1 && bgManager._primary) || searchActive) { const sigma = Math.round(Util.lerp(opt.OVERVIEW_BG_BLUR_SIGMA, opt.APP_GRID_BG_BLUR_SIGMA, progress % 1)); - if (sigma !== blurEffect.sigma) - blurEffect.sigma = sigma; + if (sigma !== blurEffect[radius]) + blurEffect[radius] = sigma; } else if (stateValue === 1 && !(opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE)) { - blurEffect.sigma = opt.OVERVIEW_BG_BLUR_SIGMA; + blurEffect[radius] = opt.OVERVIEW_BG_BLUR_SIGMA; } else if (stateValue === 0 || (stateValue === 1 && (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE))) { - blurEffect.sigma = 0; + blurEffect[radius] = 0; } } } }, + + _updatePositionFromDashToDock() { + // update variables that cannot be processed within settings + const dash = Main.overview.dash; + opt.DASH_POSITION = dash._position; + opt.DASH_TOP = opt.DASH_POSITION === 0; + opt.DASH_RIGHT = opt.DASH_POSITION === 1; + opt.DASH_BOTTOM = opt.DASH_POSITION === 2; + opt.DASH_LEFT = opt.DASH_POSITION === 3; + opt.DASH_VERTICAL = opt.DASH_LEFT || opt.DASH_RIGHT; + }, }; const ControlsManagerLayoutVertical = { _computeWorkspacesBoxForState(state, box, workAreaBox, dashWidth, dashHeight, thumbnailsWidth, thumbnailsHeight, searchHeight, startY) { // in case the function is called from the DtD - if (startY === undefined) { + if (startY === undefined) workAreaBox = box; - } + const workspaceBox = box.copy(); let [width, height] = workspaceBox.get_size(); - const { spacing } = this; + const spacing = 12; const dash = Main.overview.dash; // including Dash to Dock and clones properties for compatibility if (Me.Util.dashIsDashToDock()) { + // ensure or position variables are updated + ControlsManagerCommon._updatePositionFromDashToDock(); // Dash to Dock also always affects workAreaBox Main.layoutManager._trackedActors.forEach(actor => { if (actor.affectsStruts && actor.actor.width === dash.width) { @@ -1028,15 +1049,15 @@ const ControlsManagerLayoutVertical = { _getAppDisplayBoxForState(state, box, workAreaBox, searchHeight, dashWidth, dashHeight, thumbnailsWidth, startY) { // in case the function is called from the DtD - if (startY === undefined) { + if (startY === undefined) workAreaBox = box; - } + const [width] = box.get_size(); const { x1: startX } = workAreaBox; // const { y1: startY } = workAreaBox; let height = workAreaBox.get_height(); const appDisplayBox = new Clutter.ActorBox(); - const { spacing } = this; + const spacing = 12; searchHeight = opt.SHOW_SEARCH_ENTRY ? searchHeight : 0; const xOffsetL = (opt.WS_TMB_LEFT ? thumbnailsWidth : 0) + (opt.DASH_LEFT ? dashWidth : 0); @@ -1083,7 +1104,7 @@ const ControlsManagerLayoutVertical = { vfunc_allocate(container, box) { const childBox = new Clutter.ActorBox(); const transitionParams = this._stateAdjustment.getStateTransitionParams(); - const { spacing } = this; + const spacing = 12; const halfSpacing = spacing / 2; const monitor = Main.layoutManager.findMonitorForActor(this._container); const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); @@ -1111,6 +1132,8 @@ const ControlsManagerLayoutVertical = { // dash cloud be overridden by the Dash to Dock clone const dash = Main.overview.dash; if (Me.Util.dashIsDashToDock()) { + // ensure our position variables are updated + ControlsManagerCommon._updatePositionFromDashToDock(); // if Dash to Dock replaced the default dash and its inteli-hide is disabled we need to compensate for affected startY if (!Main.overview.dash.get_parent()?.get_parent()?.get_parent()?._intellihideIsEnabled) { if (Main.panel.y === monitor.y) @@ -1320,16 +1343,18 @@ const ControlsManagerLayoutVertical = { const ControlsManagerLayoutHorizontal = { _computeWorkspacesBoxForState(state, box, workAreaBox, dashWidth, dashHeight, thumbnailWidth, thumbnailsHeight, searchHeight, startY) { // in case the function is called from the DtD - if (startY === undefined) { + if (startY === undefined) workAreaBox = box; - } + const workspaceBox = box.copy(); let [width, height] = workspaceBox.get_size(); - const { spacing } = this; + const spacing = 12; const dash = Main.overview.dash; // including Dash to Dock and clones properties for compatibility if (Me.Util.dashIsDashToDock()) { + // ensure our position variables are updated + ControlsManagerCommon._updatePositionFromDashToDock(); // Dash to Dock always affects workAreaBox Main.layoutManager._trackedActors.forEach(actor => { if (actor.affectsStruts && actor.actor.width === dash.width) { @@ -1448,7 +1473,7 @@ const ControlsManagerLayoutHorizontal = { // const { y1: startY } = workAreaBox; let height = workAreaBox.get_height(); const appDisplayBox = new Clutter.ActorBox(); - const { spacing } = this; + const spacing = 12; const yOffsetT = (opt.WS_TMB_TOP ? thumbnailsHeight + spacing : 0) + (opt.DASH_TOP ? dashHeight : 0) + (opt.SHOW_SEARCH_ENTRY ? searchHeight : 0); const yOffsetB = (opt.WS_TMB_BOTTOM ? thumbnailsHeight + spacing : 0) + (opt.DASH_BOTTOM ? dashHeight : 0); @@ -1495,7 +1520,7 @@ const ControlsManagerLayoutHorizontal = { vfunc_allocate(container, box) { const transitionParams = this._stateAdjustment.getStateTransitionParams(); const childBox = new Clutter.ActorBox(); - const { spacing } = this; + const spacing = 12; const halfSpacing = spacing / 2; const monitor = Main.layoutManager.findMonitorForActor(this._container); const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); @@ -1528,7 +1553,7 @@ const ControlsManagerLayoutHorizontal = { // if (Main.panel.y === monitor.y) // startY = Main.panel.height + spacing; } - dashHeight = dash.height; + dashHeight = dash.height + halfSpacing; dashWidth = dash.width; opt.DASH_TOP = dash._position === 0; opt.DASH_VERTICAL = [1, 3].includes(dash._position); @@ -1587,9 +1612,13 @@ const ControlsManagerLayoutHorizontal = { else wsTmbY = Math.round(startY + height - (opt.DASH_BOTTOM ? dashHeight : halfSpacing) - wsTmbHeight); - let wstOffset = (width - wsTmbWidth - dashWidthReservation) / 2; + let wstOffset = (width - wsTmbWidth) / 2; wstOffset -= opt.WS_TMB_POSITION_ADJUSTMENT * wstOffset; - let wsTmbX = Math.round(startX + (opt.DASH_LEFT ? dashWidthReservation : 0) + wstOffset); + let wsTmbX = Math.round(startX + wstOffset); + if (opt.DASH_LEFT) + wsTmbX = Math.max(wsTmbX, startX + dashWidthReservation); + else if (opt.DASH_RIGHT) + wsTmbX = Math.min(wsTmbX, startX + width - wsTmbWidth - dashWidthReservation); childBox.set_origin(wsTmbX, wsTmbY); childBox.set_size(Math.max(wsTmbWidth, 1), Math.max(wsTmbHeight, 1)); @@ -1748,8 +1777,10 @@ function _getFitModeForState(state) { const LayoutManager = { _startupAnimation() { - if (Me.Util.dashIsDashToDock() && !Meta.is_restart()) { - // DtD breaks overview on startup + const dtdEnabled = !!((Me.Util.getEnabledExtensions('dash-to-dock').length && !Me.Util.getEnabledExtensions('dash-to-dock-vshell').length) || + Me.Util.getEnabledExtensions('ubuntu-dock').length); + if (dtdEnabled && !Meta.is_restart()) { + // DtD without V-Shell patch breaks overview on startup // Skip animation to hide the mess this._startupAnimationComplete(); Main.overview._overview.controls._finishStartupSequence(); diff --git a/extensions/45/vertical-workspaces/lib/panel.js b/extensions/45/vertical-workspaces/lib/panel.js index a148612..f78ab6f 100644 --- a/extensions/45/vertical-workspaces/lib/panel.js +++ b/extensions/45/vertical-workspaces/lib/panel.js @@ -3,7 +3,7 @@ * panel.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/recentFilesSearchProvider.js b/extensions/45/vertical-workspaces/lib/recentFilesSearchProvider.js index 6dfec0a..f050cf9 100644 --- a/extensions/45/vertical-workspaces/lib/recentFilesSearchProvider.js +++ b/extensions/45/vertical-workspaces/lib/recentFilesSearchProvider.js @@ -3,7 +3,7 @@ * recentFilesSearchProvider.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 */ @@ -12,7 +12,6 @@ import GLib from 'gi://GLib'; import St from 'gi://St'; import Gio from 'gi://Gio'; -import Shell from 'gi://Shell'; import * as Main from 'resource:///org/gnome/shell/ui/main.js'; @@ -25,6 +24,7 @@ let _; // so it needs to be something less common // needs to be accessible from vw module export const PREFIX = 'fq//'; +const ID = 'recent-files'; export const RecentFilesSearchProviderModule = class { // export for other modules @@ -68,8 +68,8 @@ export const RecentFilesSearchProviderModule = class { 2000, () => { if (!this._recentFilesSearchProvider) { - this._recentFilesSearchProvider = new RecentFilesSearchProvider(opt); - this._getOverviewSearchResult()._registerProvider(this._recentFilesSearchProvider); + this._recentFilesSearchProvider = new RecentFilesSearchProvider(); + this._registerProvider(this._recentFilesSearchProvider); } this._enableTimeoutId = 0; return GLib.SOURCE_REMOVE; @@ -81,7 +81,7 @@ export const RecentFilesSearchProviderModule = class { _disableModule() { if (this._recentFilesSearchProvider) { - this._getOverviewSearchResult()._unregisterProvider(this._recentFilesSearchProvider); + this._unregisterProvider(this._recentFilesSearchProvider); this._recentFilesSearchProvider = null; } if (this._enableTimeoutId) { @@ -92,32 +92,44 @@ export const RecentFilesSearchProviderModule = class { console.debug(' RecentFilesSearchProviderModule - Disabled'); } - _getOverviewSearchResult() { - return Main.overview._overview.controls._searchController._searchResults; + _registerProvider(provider) { + const searchResults = Main.overview.searchController._searchResults; + provider.searchInProgress = false; + + searchResults._providers.push(provider); + + // create results display and add it to the _content + searchResults._ensureProviderDisplay.bind(searchResults)(provider); + } + + _unregisterProvider(provider) { + const searchResults = Main.overview.searchController._searchResults; + searchResults._unregisterProvider(provider); } }; class RecentFilesSearchProvider { constructor() { - this.id = 'recent-files'; - const appSystem = Shell.AppSystem.get_default(); - let appInfo = appSystem.lookup_app('org.gnome.Nautilus.desktop')?.get_app_info(); - if (!appInfo) - appInfo = Gio.AppInfo.create_from_commandline('/usr/bin/nautilus -w', _('Recent Files'), null); - appInfo.get_description = () => _('Search recent files'); - appInfo.get_name = () => _('Recent Files'); - appInfo.get_id = () => 'org.gnome.Nautilus.desktop'; - appInfo.get_icon = () => Gio.icon_new_for_string('document-open-recent-symbolic'); - appInfo.should_show = () => true; - - this.appInfo = appInfo; + this.id = ID; + const appId = 'org.gnome.Nautilus.desktop'; + + // A real appInfo created from a commandline has often issues with overriding get_id() method, so we use dict instead + this.appInfo = { + get_id: () => appId, + get_name: () => _('Recent Files'), + get_icon: () => Gio.icon_new_for_string('focus-windows-symbolic'), + should_show: () => true, + get_commandline: () => '/usr/bin/nautilus -w recent:///', + launch: () => {}, + }; + this.canLaunchSearch = true; this.isRemoteProvider = false; this._recentFilesManager = new RecentFilesManager(); } - getInitialResultSet(terms/* , callback*/) { + getInitialResultSet(terms/* , cancellable*/) { const rfm = this._recentFilesManager; rfm.loadFromFile(); @@ -215,13 +227,9 @@ class RecentFilesSearchProvider { return results.slice(0, 20); } - getSubsearchResultSet(previousResults, terms/* , callback*/) { + getSubsearchResultSet(previousResults, terms/* , cancellable*/) { return this.getInitialResultSet(terms); } - - getSubsearchResultSet42(terms, callback) { - callback(this._getResultSet(terms)); - } } class RecentFilesManager { diff --git a/extensions/45/vertical-workspaces/lib/search.js b/extensions/45/vertical-workspaces/lib/search.js index e961893..fc15862 100644 --- a/extensions/45/vertical-workspaces/lib/search.js +++ b/extensions/45/vertical-workspaces/lib/search.js @@ -3,13 +3,14 @@ * search.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ 'use strict'; +import GLib from 'gi://GLib'; import Clutter from 'gi://Clutter'; import St from 'gi://St'; import Shell from 'gi://Shell'; @@ -20,6 +21,7 @@ import * as Search from 'resource:///org/gnome/shell/ui/search.js'; import * as AppDisplay from 'resource:///org/gnome/shell/ui/appDisplay.js'; import * as SystemActions from 'resource:///org/gnome/shell/misc/systemActions.js'; +import { Highlighter } from 'resource:///org/gnome/shell/misc/util.js'; let Me; // gettext @@ -72,31 +74,42 @@ export const SearchModule = class { this._overrides.addOverride('SearchResult', Search.SearchResult.prototype, SearchResult); this._overrides.addOverride('SearchResultsView', Search.SearchResultsView.prototype, SearchResultsView); this._overrides.addOverride('ListSearchResults', Search.ListSearchResults.prototype, ListSearchResults); - // this._overrides.addOverride('ProviderInfo', Search.ProviderInfo.prototype, ProviderInfo); + this._overrides.addOverride('ListSearchResult', Search.ListSearchResult.prototype, ListSearchResultOverride); + this._overrides.addOverride('Highlighter', Highlighter.prototype, HighlighterOverride); // Don't expand the search view vertically and align it to the top // this is important in the static workspace mode when the search view bg is not transparent // also the "Searching..." and "No Results" notifications will be closer to the search entry, with the distance given by margin-top in the stylesheet - Main.overview._overview._controls.layoutManager._searchController.y_align = Clutter.ActorAlign.START; + Main.overview.searchController.y_align = Clutter.ActorAlign.START; + // Increase the maxResults for app search so that it can show more results in case the user decreases the size of the result icon + const appSearchDisplay = Main.overview.searchController._searchResults._providers.filter(p => p.id === 'applications')[0]?.display; + if (appSearchDisplay) + appSearchDisplay._maxResults = 12; console.debug(' SearchModule - Activated'); } _disableModule() { const reset = true; + + const searchResults = Main.overview.searchController._searchResults; + if (searchResults?._searchTimeoutId) { + GLib.source_remove(searchResults._searchTimeoutId); + searchResults._searchTimeoutId = 0; + } + this._updateSearchViewWidth(reset); if (this._overrides) this._overrides.removeAll(); this._overrides = null; - Main.overview._overview._controls.layoutManager._searchController.y_align = Clutter.ActorAlign.FILL; - + Main.overview.searchController.y_align = Clutter.ActorAlign.FILL; console.debug(' WorkspaceSwitcherPopupModule - Disabled'); } _updateSearchViewWidth(reset = false) { - const searchContent = Main.overview._overview._controls.layoutManager._searchController._searchResults._content; + const searchContent = Main.overview.searchController._searchResults._content; if (!SEARCH_MAX_WIDTH) { // just store original value; const themeNode = searchContent.get_theme_node(); const width = themeNode.get_max_width(); @@ -160,8 +173,8 @@ const AppSearchProvider = { let dispName = appInfo.get_display_name() || ''; let gName = appInfo.get_generic_name() || ''; let description = appInfo.get_description() || ''; - let categories = appInfo.get_string('Categories') || ''; - let keywords = appInfo.get_string('Keywords') || ''; + let categories = appInfo.get_string('Categories')?.replace(/;/g, ' ') || ''; + let keywords = appInfo.get_string('Keywords')?.replace(/;/g, ' ') || ''; name = `${dispName} ${id}`; string = `${dispName} ${gName} ${baseName} ${description} ${categories} ${keywords} ${id}`; } @@ -242,22 +255,63 @@ const SearchResult = { }; const SearchResultsView = { + setTerms(terms) { + // Check for the case of making a duplicate previous search before + // setting state of the current search or cancelling the search. + // This will prevent incorrect state being as a result of a duplicate + // search while the previous search is still active. + let searchString = terms.join(' '); + let previousSearchString = this._terms.join(' '); + if (searchString === previousSearchString) + return; + + this._startingSearch = true; + + this._cancellable.cancel(); + this._cancellable.reset(); + + if (terms.length === 0) { + this._reset(); + return; + } + + let isSubSearch = false; + if (this._terms.length > 0) + isSubSearch = searchString.indexOf(previousSearchString) === 0; + + this._terms = terms; + this._isSubSearch = isSubSearch; + this._updateSearchProgress(); + + if (!this._searchTimeoutId) + this._searchTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, opt.SEARCH_DELAY, this._onSearchTimeout.bind(this)); + + this._highlighter = new Highlighter(this._terms); + + this.emit('terms-changed'); + }, + _doSearch() { this._startingSearch = false; let previousResults = this._results; this._results = {}; + const term0 = this._terms[0]; + const onlySupportedProviders = term0.startsWith(Me.WSP_PREFIX) || term0.startsWith(Me.ESP_PREFIX) || term0.startsWith(Me.RFSP_PREFIX); + this._providers.forEach(provider => { - const onlyVShellProviders = this._terms.includes('wq//') || this._terms.includes('fq//'); - if (!onlyVShellProviders || (onlyVShellProviders && (provider.id.includes('open-windows') || provider.id.includes('recent-files')))) { + const supportedProvider = ['open-windows', 'extensions', 'recent-files'].includes(provider.id); + if (!onlySupportedProviders || (onlySupportedProviders && supportedProvider)) { let previousProviderResults = previousResults[provider.id]; this._doProviderSearch(provider, previousProviderResults); + } else { + // hide unwanted providers, they will show() automatically when needed + provider.display.visible = false; } }); this._updateSearchProgress(); - this._clearSearchTimeout(); }, @@ -279,13 +333,73 @@ const SearchResultsView = { }, }; -// fixes app is null error if search provider id is not a desktop app id. -// is not accessible in 45 -/* const ProviderInfo = { - animateLaunch() { - let appSys = Shell.AppSystem.get_default(); - let app = appSys.lookup_app(this.provider.appInfo.get_id()); - if (app && app.state === Shell.AppState.STOPPED) - IconGrid.zoomOutActor(this._content); +// Add highlighting of the "name" part of the result for all providers +const ListSearchResultOverride = { + _highlightTerms() { + let markup = this._resultsView.highlightTerms(this.metaInfo['name']); + this.label_actor.clutter_text.set_markup(markup); + markup = this._resultsView.highlightTerms(this.metaInfo['description'].split('\n')[0]); + this._descriptionLabel.clutter_text.set_markup(markup); + }, +}; + +const HighlighterOverride = { + /** + * @param {?string[]} terms - list of terms to highlight + */ + /* constructor(terms) { + if (!terms) + return; + + const escapedTerms = terms + .map(term => Shell.util_regex_escape(term)) + .filter(term => term.length > 0); + + if (escapedTerms.length === 0) + return; + + this._highlightRegex = new RegExp( + `(${escapedTerms.join('|')})`, 'gi'); + },*/ + + /** + * Highlight all occurences of the terms defined for this + * highlighter in the provided text using markup. + * + * @param {string} text - text to highlight the defined terms in + * @returns {string} + */ + highlight(text, options) { + if (!this._highlightRegex) + return GLib.markup_escape_text(text, -1); + + // force use local settings if the class is overridden by another extension (WSP, ESP) + const o = options || opt; + let escaped = []; + let lastMatchEnd = 0; + let match; + let style = ['', '']; + if (o.HIGHLIGHT_DEFAULT) + style = ['<b>', '</b>']; + // The default highlighting by the bold style causes text to be "randomly" ellipsized in cases where it's not necessary + // and also blurry + // Underscore doesn't affect label size and all looks better + else if (o.HIGHLIGHT_UNDERLINE) + style = ['<u>', '</u>']; + + while ((match = this._highlightRegex.exec(text))) { + if (match.index > lastMatchEnd) { + let unmatched = GLib.markup_escape_text( + text.slice(lastMatchEnd, match.index), -1); + escaped.push(unmatched); + } + let matched = GLib.markup_escape_text(match[0], -1); + escaped.push(`${style[0]}${matched}${style[1]}`); + lastMatchEnd = match.index + match[0].length; + } + let unmatched = GLib.markup_escape_text( + text.slice(lastMatchEnd), -1); + escaped.push(unmatched); + return escaped.join(''); }, -};*/ +}; diff --git a/extensions/45/vertical-workspaces/lib/searchController.js b/extensions/45/vertical-workspaces/lib/searchController.js index e69bc90..1722f15 100644 --- a/extensions/45/vertical-workspaces/lib/searchController.js +++ b/extensions/45/vertical-workspaces/lib/searchController.js @@ -3,7 +3,7 @@ * searchController.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -51,15 +51,15 @@ export const SearchControllerModule = class { _activateModule() { if (!this._originalOnStageKeyPress) - this._originalOnStageKeyPress = Main.overview._overview.controls._searchController._onStageKeyPress; + this._originalOnStageKeyPress = Main.overview.searchController._onStageKeyPress; - Main.overview._overview.controls._searchController._onStageKeyPress = SearchControllerCommon._onStageKeyPress; + Main.overview.searchController._onStageKeyPress = SearchControllerCommon._onStageKeyPress; console.debug(' SearchControllerModule - Activated'); } _disableModule() { if (this._originalOnStageKeyPress) - Main.overview._overview.controls._searchController._onStageKeyPress = this._originalOnStageKeyPress; + Main.overview.searchController._onStageKeyPress = this._originalOnStageKeyPress; this._originalOnStageKeyPress = null; console.debug(' SearchControlerModule - Disabled'); diff --git a/extensions/45/vertical-workspaces/lib/settings.js b/extensions/45/vertical-workspaces/lib/settings.js index d8bb99c..dcfc8f9 100644 --- a/extensions/45/vertical-workspaces/lib/settings.js +++ b/extensions/45/vertical-workspaces/lib/settings.js @@ -3,7 +3,7 @@ * settings.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 */ @@ -52,9 +52,6 @@ export const Options = class Options { closeWsButtonMode: ['int', 'close-ws-button-mode'], secWsTmbPositionAdjust: ['int', 'sec-wst-position-adjust'], dashMaxIconSize: ['int', 'dash-max-icon-size'], - dashShowWindowsIcon: ['int', 'dash-show-windows-icon'], - dashShowRecentFilesIcon: ['int', 'dash-show-recent-files-icon'], - dashShowExtensionsIcon: ['int', 'dash-show-extensions-icon'], centerDashToWs: ['boolean', 'center-dash-to-ws'], showAppsIconPosition: ['int', 'show-app-icon-position'], wsThumbnailScale: ['int', 'ws-thumbnail-scale'], @@ -87,6 +84,7 @@ export const Options = class Options { startupState: ['int', 'startup-state'], overviewMode: ['int', 'overview-mode'], workspaceSwitcherAnimation: ['int', 'workspace-switcher-animation'], + wsSwitcherMode: ['int', 'ws-switcher-mode'], searchIconSize: ['int', 'search-icon-size'], searchViewScale: ['int', 'search-width-scale'], appGridIconSize: ['int', 'app-grid-icon-size'], @@ -136,8 +134,9 @@ export const Options = class Options { overlayKeySecondary: ['int', 'overlay-key-secondary'], overviewEscBehavior: ['int', 'overview-esc-behavior'], newWindowFocusFix: ['boolean', 'new-window-focus-fix'], + newWindowMonitorFix: ['boolean', 'new-window-monitor-fix'], appGridPerformance: ['boolean', 'app-grid-performance'], - windowThumbnailScale: ['int', 'window-thumbnail-scale'], + highlightingStyle: ['int', 'highlighting-style'], workspaceSwitcherPopupModule: ['boolean', 'workspace-switcher-popup-module'], workspaceAnimationModule: ['boolean', 'workspace-animation-module'], @@ -145,7 +144,6 @@ export const Options = class Options { windowManagerModule: ['boolean', 'window-manager-module'], windowPreviewModule: ['boolean', 'window-preview-module'], windowAttentionHandlerModule: ['boolean', 'win-attention-handler-module'], - windowThumbnailModule: ['boolean', 'window-thumbnail-module'], swipeTrackerModule: ['boolean', 'swipe-tracker-module'], searchControllerModule: ['boolean', 'search-controller-module'], searchModule: ['boolean', 'search-module'], @@ -157,9 +155,6 @@ export const Options = class Options { dashModule: ['boolean', 'dash-module'], appFavoritesModule: ['boolean', 'app-favorites-module'], appDisplayModule: ['boolean', 'app-display-module'], - windowSearchProviderModule: ['boolean', 'window-search-provider-module'], - recentFilesSearchProviderModule: ['boolean', 'recent-files-search-provider-module'], - extensionsSearchProviderModule: ['boolean', 'extensions-search-provider-module'], profileName1: ['string', 'profile-name-1'], profileName2: ['string', 'profile-name-2'], @@ -324,9 +319,6 @@ export const Options = class Options { this.CENTER_DASH_WS = this.get('centerDashToWs'); this.MAX_ICON_SIZE = this.get('dashMaxIconSize'); - this.SHOW_WINDOWS_ICON = this.get('dashShowWindowsIcon'); - this.SHOW_RECENT_FILES_ICON = this.get('dashShowRecentFilesIcon'); - this.SHOW_EXTENSIONS_ICON = this.get('dashShowExtensionsIcon'); this.WS_TMB_POSITION = this.get('workspaceThumbnailsPosition'); this.ORIENTATION = this.WS_TMB_POSITION > 4 ? 0 : 1; @@ -395,8 +387,6 @@ export const Options = class Options { if (this.SEARCH_VIEW_ANIMATION === 4) this.SEARCH_VIEW_ANIMATION = 3; - this.WS_ANIMATION = this.get('workspaceAnimation'); - this.WIN_PREVIEW_ICON_SIZE = [64, 48, 32, 22, 8][this.get('winPreviewIconSize')]; this.WIN_TITLES_POSITION = this.get('winTitlePosition'); this.ALWAYS_SHOW_WIN_TITLES = this.WIN_TITLES_POSITION === 1; @@ -421,6 +411,7 @@ export const Options = class Options { this.SEARCH_VIEW_SCALE = this.get('searchViewScale') / 100; this.SEARCH_MAX_ROWS = this.get('searchMaxResultsRows'); this.SEARCH_FUZZY = this.get('searchFuzzy'); + this.SEARCH_DELAY = 0; this.APP_GRID_ALLOW_INCOMPLETE_PAGES = this.get('appGridIncompletePages'); this.APP_GRID_ICON_SIZE = this.get('appGridIconSize'); @@ -484,8 +475,10 @@ export const Options = class Options { this.WS_SW_POPUP_V_POSITION = this.get('wsSwPopupVPosition') / 100; this.WS_SW_POPUP_MODE = this.get('wsSwPopupMode'); + this.WS_ANIMATION = this.get('workspaceAnimation'); this.WS_WRAPAROUND = this.get('wsSwitcherWraparound'); this.WS_IGNORE_LAST = this.get('wsSwitcherIgnoreLast'); + this.WS_SWITCHER_CURRENT_MONITOR = this.get('wsSwitcherMode') === 1; this.SHOW_FAV_NOTIFICATION = this.get('favoritesNotify'); this.NOTIFICATION_POSITION = this.get('notificationPosition'); @@ -522,10 +515,15 @@ export const Options = class Options { this.ESC_BEHAVIOR = this.get('overviewEscBehavior'); - this.WINDOW_THUMBNAIL_ENABLED = this.get('windowThumbnailModule'); - this.WINDOW_THUMBNAIL_SCALE = this.get('windowThumbnailScale') / 100; + this.WINDOW_THUMBNAIL_ENABLED = !!Me.Util.getEnabledExtensions('window-thumbnails').length; this.FIX_NEW_WINDOW_FOCUS = this.get('newWindowFocusFix'); + this.FIX_NEW_WINDOW_MONITOR = this.get('newWindowMonitorFix'); + + this.HIGHLIGHTING_STYLE = this.get('highlightingStyle'); + this.HIGHLIGHT_DEFAULT = this.HIGHLIGHTING_STYLE === 0; + this.HIGHLIGHT_UNDERLINE = this.HIGHLIGHTING_STYLE === 1; + this.HIGHLIGHT_NONE = this.HIGHLIGHTING_STYLE === 2; } _getAnimationDirection() { diff --git a/extensions/45/vertical-workspaces/lib/swipeTracker.js b/extensions/45/vertical-workspaces/lib/swipeTracker.js index 354f1e0..560b296 100644 --- a/extensions/45/vertical-workspaces/lib/swipeTracker.js +++ b/extensions/45/vertical-workspaces/lib/swipeTracker.js @@ -3,7 +3,7 @@ * swipeTracker.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/util.js b/extensions/45/vertical-workspaces/lib/util.js index 38ca6cd..ab79c48 100644 --- a/extensions/45/vertical-workspaces/lib/util.js +++ b/extensions/45/vertical-workspaces/lib/util.js @@ -3,7 +3,7 @@ * util.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -285,9 +285,9 @@ export function isMoreRelevant(stringA, stringB, pattern) { export function getEnabledExtensions(pattern = '') { let result = []; - // extensionManager is unreliable at startup (if not all extensions were loaded) - // but gsettings key can contain removed extensions... - // therefore we have to look into filesystem, what's really installed + // extensionManager is unreliable at startup because it is uncertain whether all extensions have been loaded + // also gsettings key can contain already removed extensions (user deleted them without disabling them first) + // therefore we have to check what's really installed in the filesystem if (!_installedExtensions) { const extensionFiles = [...collectFromDatadirs('extensions', true)]; _installedExtensions = extensionFiles.map(({ info }) => { @@ -298,8 +298,19 @@ export function getEnabledExtensions(pattern = '') { return uuid; }); } + // _enabledExtensions contains content of the enabled-extensions key from gsettings, not actual state const enabled = Main.extensionManager._enabledExtensions; result = _installedExtensions.filter(ext => enabled.includes(ext)); + // _extensions contains already loaded extensions, so we can try to filter out broken or incompatible extensions + const active = Main.extensionManager._extensions; + result = result.filter(ext => { + const extension = active.get(ext); + if (extension) + return ![3, 4].includes(extension.state); // 3 - ERROR, 4 - OUT_OF_TIME (not supported by shell-version in metadata) + // extension can be enabled but not yet loaded, we just cannot see its state at this moment, so let it pass as enabled + return true; + }); + // return only extensions matching the search pattern return result.filter(uuid => uuid !== null && uuid.includes(pattern)); } diff --git a/extensions/45/vertical-workspaces/lib/winTmb.js b/extensions/45/vertical-workspaces/lib/winTmb.js deleted file mode 100644 index 4205822..0000000 --- a/extensions/45/vertical-workspaces/lib/winTmb.js +++ /dev/null @@ -1,525 +0,0 @@ -/** - * V-Shell (Vertical Workspaces) - * WinTmb - * - * @author GdH <G-dH@github.com> - * @copyright 2021-2023 - * @license GPL-3.0 - */ - -'use strict'; - -import GLib from 'gi://GLib'; -import Clutter from 'gi://Clutter'; -import St from 'gi://St'; -import Meta from 'gi://Meta'; -import GObject from 'gi://GObject'; - -import * as Main from 'resource:///org/gnome/shell/ui/main.js'; -import * as DND from 'resource:///org/gnome/shell/ui/dnd.js'; -import * as AltTab from 'resource:///org/gnome/shell/ui/altTab.js'; - -let Me; -let opt; - -const SCROLL_ICON_OPACITY = 240; -const DRAG_OPACITY = 200; -const CLOSE_BTN_OPACITY = 240; - - -export const WinTmbModule = class { - constructor(me) { - Me = me; - opt = Me.opt; - - this._firstActivation = true; - this.moduleEnabled = false; - } - - cleanGlobals() { - Me = null; - opt = null; - } - - update(reset) { - this._removeTimeouts(); - - this.moduleEnabled = opt.get('windowThumbnailModule'); - - reset = reset || !this.moduleEnabled; - - // don't touch the original code if module disabled - if (reset && !this._firstActivation) { - this._disableModule(); - } else if (!reset) { - this._firstActivation = false; - this._activateModule(); - } - if (reset && this._firstActivation) - console.debug(' WinTmb - Keeping untouched'); - } - - _activateModule() { - this._timeouts = {}; - if (!this._windowThumbnails) - this._windowThumbnails = []; - - Main.overview.connectObject('hidden', () => this.showThumbnails(), this); - console.debug(' WinTmb - Activated'); - } - - _disableModule() { - Main.overview.disconnectObject(this); - this._disconnectStateAdjustment(); - this.removeAllThumbnails(); - console.debug(' WinTmb - Disabled'); - } - - _removeTimeouts() { - if (this._timeouts) { - Object.values(this._timeouts).forEach(t => { - if (t) - GLib.source_remove(t); - }); - this._timeouts = null; - } - } - - createThumbnail(metaWin) { - const thumbnail = new WindowThumbnail(metaWin, { - 'height': Math.floor(opt.WINDOW_THUMBNAIL_SCALE * global.display.get_monitor_geometry(global.display.get_current_monitor()).height), - 'thumbnailsOnScreen': this._windowThumbnails.length, - }); - - this._windowThumbnails.push(thumbnail); - thumbnail.connect('removed', tmb => { - this._windowThumbnails.splice(this._windowThumbnails.indexOf(tmb), 1); - tmb.destroy(); - if (!this._windowThumbnails.length) - this._disconnectStateAdjustment(); - }); - - if (!this._stateAdjustmentConId) { - this._stateAdjustmentConId = Main.overview._overview.controls._stateAdjustment.connectObject('notify::value', () => { - if (!this._thumbnailsHidden && (!opt.OVERVIEW_MODE2 || opt.WORKSPACE_MODE)) - this.hideThumbnails(); - }, this); - } - } - - hideThumbnails() { - this._windowThumbnails.forEach(tmb => { - tmb.ease({ - opacity: 0, - duration: 200, - mode: Clutter.AnimationMode.LINEAR, - onComplete: () => tmb.hide(), - }); - }); - this._thumbnailsHidden = true; - } - - showThumbnails() { - this._windowThumbnails.forEach(tmb => { - tmb.show(); - tmb.ease({ - opacity: 255, - duration: 100, - mode: Clutter.AnimationMode.LINEAR, - }); - }); - this._thumbnailsHidden = false; - } - - removeAllThumbnails() { - this._windowThumbnails.forEach(tmb => tmb.remove()); - this._windowThumbnails = []; - } - - _disconnectStateAdjustment() { - Main.overview._overview.controls._stateAdjustment.disconnectObject(this); - } -}; - -const WindowThumbnail = GObject.registerClass({ - Signals: { 'removed': {} }, -}, class WindowThumbnail extends St.Widget { - _init(metaWin, args) { - this._hoverShowsPreview = false; - this._customOpacity = 255; - this._initTmbHeight = args.height; - this._minimumHeight = Math.floor(5 / 100 * global.display.get_monitor_geometry(global.display.get_current_monitor()).height); - this._scrollTimeout = 100; - this._positionOffset = args.thumbnailsOnScreen; - this._reverseTmbWheelFunc = false; - this._click_count = 1; - this._prevBtnPressTime = 0; - this.w = metaWin; - super._init({ - layout_manager: new Clutter.BinLayout(), - visible: true, - reactive: true, - can_focus: true, - track_hover: true, - }); - this.connect('button-release-event', this._onBtnReleased.bind(this)); - this.connect('scroll-event', this._onScrollEvent.bind(this)); - // this.connect('motion-event', this._onMouseMove.bind(this)); // may be useful in the future.. - - this._delegate = this; - this._draggable = DND.makeDraggable(this, { dragActorOpacity: DRAG_OPACITY }); - this._draggable.connect('drag-end', this._end_drag.bind(this)); - this._draggable.connect('drag-cancelled', this._end_drag.bind(this)); - this._draggable._animateDragEnd = eventTime => { - this._draggable._animationInProgress = true; - this._draggable._onAnimationComplete(this._draggable._dragActor, eventTime); - this.opacity = this._customOpacity; - }; - - this.clone = new Clutter.Clone({ reactive: true }); - Main.layoutManager.addChrome(this); - - this.window = this.w.get_compositor_private(); - - this.clone.set_source(this.window); - - this.add_child(this.clone); - this._addCloseButton(); - this._addScrollModeIcon(); - - this.connect('enter-event', () => { - global.display.set_cursor(Meta.Cursor.POINTING_HAND); - this._closeButton.opacity = CLOSE_BTN_OPACITY; - this._scrollModeBin.opacity = SCROLL_ICON_OPACITY; - if (this._hoverShowsPreview && !Main.overview._shown) { - this._closeButton.opacity = 50; - this._showWindowPreview(false, true); - } - }); - - this.connect('leave-event', () => { - global.display.set_cursor(Meta.Cursor.DEFAULT); - this._closeButton.opacity = 0; - this._scrollModeBin.opacity = 0; - if (this._winPreview) - this._destroyWindowPreview(); - }); - - this._setSize(true); - this.set_position(...this._getInitialPosition()); - this.show(); - this.window_id = this.w.get_id(); - this.tmbRedrawDirection = true; - - // remove thumbnail content and hide thumbnail if its window is destroyed - this.windowConnect = this.window.connect('destroy', () => { - if (this) - this.remove(); - }); - } - - _getInitialPosition() { - const offset = 20; - let monitor = Main.layoutManager.monitors[global.display.get_current_monitor()]; - let x = Math.min(monitor.x + monitor.width - (this.window.width * this.scale) - offset); - let y = Math.min(monitor.y + monitor.height - (this.window.height * this.scale) - offset - ((this._positionOffset * this._initTmbHeight) % (monitor.height - this._initTmbHeight))); - return [x, y]; - } - - _setSize(resetScale = false) { - if (resetScale) - this.scale = Math.min(1.0, this._initTmbHeight / this.window.height); - - const width = this.window.width * this.scale; - const height = this.window.height * this.scale; - this.set_size(width, height); - /* if (this.icon) { - this.icon.scale_x = this.scale; - this.icon.scale_y = this.scale; - }*/ - - // when the scale of this. actor change, this.clone resize accordingly, - // but the reactive area of the actor doesn't change until the actor is redrawn - // this updates the actor's input region area: - Main.layoutManager._queueUpdateRegions(); - } - - /* _onMouseMove(actor, event) { - let [pos_x, pos_y] = event.get_coords(); - let state = event.get_state(); - if (this._ctrlPressed(state)) { - } - }*/ - - _onBtnReleased(actor, event) { - // Clutter.Event.click_count property in no longer available, since GS42 - if ((event.get_time() - this._prevBtnPressTime) < Clutter.Settings.get_default().double_click_time) - this._click_count += 1; - else - this._click_count = 1; - - this._prevBtnPressTime = event.get_time(); - - if (this._click_count === 2 && event.get_button() === Clutter.BUTTON_PRIMARY) - this.w.activate(global.get_current_time()); - - - const button = event.get_button(); - const state = event.get_state(); - switch (button) { - case Clutter.BUTTON_PRIMARY: - if (this._ctrlPressed(state)) { - this._setSize(); - } else { - this._reverseTmbWheelFunc = !this._reverseTmbWheelFunc; - this._scrollModeBin.set_child(this._reverseTmbWheelFunc ? this._scrollModeSourceIcon : this._scrollModeResizeIcon); - } - return Clutter.EVENT_STOP; - case Clutter.BUTTON_SECONDARY: - if (this._ctrlPressed(state)) { - this.remove(); - } else { - this._hoverShowsPreview = !this._hoverShowsPreview; - this._showWindowPreview(); - } - return Clutter.EVENT_STOP; - case Clutter.BUTTON_MIDDLE: - if (this._ctrlPressed(state)) - this.w.delete(global.get_current_time()); - return Clutter.EVENT_STOP; - default: - return Clutter.EVENT_PROPAGATE; - } - } - - _onScrollEvent(actor, event) { - let direction = Me.Util.getScrollDirection(event); - - if (this._actionTimeoutActive()) - return Clutter.EVENT_PROPAGATE; - let state = event.get_state(); - switch (direction) { - case Clutter.ScrollDirection.UP: - if (this._shiftPressed(state)) { - this.opacity = Math.min(255, this.opacity + 24); - this._customOpacity = this.opacity; - } else if (this._reverseTmbWheelFunc !== this._ctrlPressed(state)) { - this._switchSourceWin(-1); - } else if (this._reverseTmbWheelFunc === this._ctrlPressed(state)) { - this.scale = Math.max(0.05, this.scale - 0.025); - } - break; - case Clutter.ScrollDirection.DOWN: - if (this._shiftPressed(state)) { - this.opacity = Math.max(48, this.opacity - 24); - this._customOpacity = this.opacity; - } else if (this._reverseTmbWheelFunc !== this._ctrlPressed(state)) { - this._switchSourceWin(+1); - } else if (this._reverseTmbWheelFunc === this._ctrlPressed(state)) { - this.scale = Math.min(1, this.scale + 0.025); - } - break; - default: - return Clutter.EVENT_PROPAGATE; - } - this._setSize(); - return Clutter.EVENT_STOP; - } - - remove() { - if (this.clone) { - this.window.disconnect(this.windowConnect); - this.clone.set_source(null); - } - if (this._winPreview) - this._destroyWindowPreview(); - - this.emit('removed'); - } - - _end_drag() { - this.set_position(this._draggable._dragOffsetX + this._draggable._dragX, this._draggable._dragOffsetY + this._draggable._dragY); - this._setSize(); - } - - _ctrlPressed(state) { - return (state & Clutter.ModifierType.CONTROL_MASK) !== 0; - } - - _shiftPressed(state) { - return (state & Clutter.ModifierType.SHIFT_MASK) !== 0; - } - - _switchSourceWin(direction) { - let windows = global.display.get_tab_list(Meta.TabList.NORMAL_ALL, null); - windows = windows.filter(w => !(w.skip_taskbar || w.minimized)); - let idx = -1; - for (let i = 0; i < windows.length; i++) { - if (windows[i] === this.w) { - idx = i + direction; - break; - } - } - idx = idx >= windows.length ? 0 : idx; - idx = idx < 0 ? windows.length - 1 : idx; - let w = windows[idx]; - let win = w.get_compositor_private(); - this.clone.set_source(win); - this.window.disconnect(this.windowConnect); - // the new thumbnail should be the same height as the previous one - this.scale = (this.scale * this.window.height) / win.height; - this.window = win; - this.windowConnect = this.window.connect('destroy', () => { - if (this) - this.remove(); - }); - this.w = w; - - if (this._winPreview) - this._showWindowPreview(true); - } - - _actionTimeoutActive() { - const timeout = this._reverseTmbWheelFunc ? this._scrollTimeout : this._scrollTimeout / 4; - if (!this._lastActionTime || Date.now() - this._lastActionTime > timeout) { - this._lastActionTime = Date.now(); - return false; - } - return true; - } - - /* _setIcon() { - let tracker = Shell.WindowTracker.get_default(); - let app = tracker.get_window_app(this.w); - let icon = app - ? app.create_icon_texture(this.height) - : new St.Icon({ icon_name: 'icon-missing', icon_size: this.height }); - icon.x_expand = icon.y_expand = true; - if (this.icon) - this.icon.destroy(); - this.icon = icon; - }*/ - - _addCloseButton() { - const closeButton = new St.Button({ - opacity: 0, - style_class: 'window-close', - child: new St.Icon({ icon_name: 'preview-close-symbolic' }), - x_align: Clutter.ActorAlign.END, - y_align: Clutter.ActorAlign.START, - x_expand: true, - y_expand: true, - }); - - closeButton.set_style(` - margin: 3px; - background-color: rgba(200, 0, 0, 0.9); - `); - - closeButton.connect('clicked', () => { - this.remove(); - return Clutter.EVENT_STOP; - }); - - this._closeButton = closeButton; - this.add_child(this._closeButton); - } - - _addScrollModeIcon() { - this._scrollModeBin = new St.Bin({ - x_expand: true, - y_expand: true, - }); - this._scrollModeResizeIcon = new St.Icon({ - icon_name: 'view-fullscreen-symbolic', - x_align: Clutter.ActorAlign.CENTER, - y_align: Clutter.ActorAlign.END, - x_expand: true, - y_expand: true, - opacity: SCROLL_ICON_OPACITY, - style_class: 'icon-dropshadow', - scale_x: 0.5, - scale_y: 0.5, - }); - this._scrollModeResizeIcon.set_style(` - margin: 13px; - color: rgb(255, 255, 255); - box-shadow: 0 0 40px 40px rgba(0,0,0,0.7); - `); - this._scrollModeSourceIcon = new St.Icon({ - icon_name: 'media-skip-forward-symbolic', - x_align: Clutter.ActorAlign.CENTER, - y_align: Clutter.ActorAlign.END, - x_expand: true, - y_expand: true, - opacity: SCROLL_ICON_OPACITY, - style_class: 'icon-dropshadow', - scale_x: 0.5, - scale_y: 0.5, - }); - this._scrollModeSourceIcon.set_style(` - margin: 13px; - color: rgb(255, 255, 255); - box-shadow: 0 0 40px 40px rgba(0,0,0,0.7); - `); - this._scrollModeBin.set_child(this._scrollModeResizeIcon); - this.add_child(this._scrollModeBin); - this._scrollModeBin.opacity = 0; - } - - _showWindowPreview(update = false, dontDestroy = false) { - if (this._winPreview && !dontDestroy) { - this._destroyWindowPreview(); - this._previewCreationTime = 0; - this._closeButton.opacity = CLOSE_BTN_OPACITY; - if (!update) - return; - } - - if (!this._winPreview) { - this._winPreview = new AltTab.CyclerHighlight(); - global.window_group.add_actor(this._winPreview); - [this._winPreview._xPointer, this._winPreview._yPointer] = global.get_pointer(); - } - - if (!update) { - this._winPreview.opacity = 0; - this._winPreview.ease({ - opacity: 255, - duration: 70, - mode: Clutter.AnimationMode.LINEAR, - /* onComplete: () => { - this._closeButton.opacity = 50; - },*/ - }); - - this.ease({ - opacity: Math.min(50, this._customOpacity), - duration: 70, - mode: Clutter.AnimationMode.LINEAR, - onComplete: () => { - }, - }); - } else { - this._winPreview.opacity = 255; - } - this._winPreview.window = this.w; - this._winPreview._window = this.w; - global.window_group.set_child_above_sibling(this._winPreview, null); - } - - _destroyWindowPreview() { - if (this._winPreview) { - this._winPreview.ease({ - opacity: 0, - duration: 100, - mode: Clutter.AnimationMode.LINEAR, - onComplete: () => { - this._winPreview.destroy(); - this._winPreview = null; - this.opacity = this._customOpacity; - }, - }); - } - } -}); diff --git a/extensions/45/vertical-workspaces/lib/windowAttentionHandler.js b/extensions/45/vertical-workspaces/lib/windowAttentionHandler.js index d49c1ad..744f5b6 100644 --- a/extensions/45/vertical-workspaces/lib/windowAttentionHandler.js +++ b/extensions/45/vertical-workspaces/lib/windowAttentionHandler.js @@ -3,7 +3,7 @@ * windowAttentionHandler.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -87,7 +87,13 @@ const WindowAttentionHandlerCommon = { const app = this._tracker.get_window_app(window); // const source = new WindowAttentionHandler.WindowAttentionSource(app, window); - const source = new MessageTray.Source(app.get_name()); + let args; + if (!Main.overview.dash.add_actor) // detects GS 46 - Clutter.Container has been removed + args = { title: app.get_name() }; + else + args = app.get_name(); + + const source = new MessageTray.Source(args); new Me.Util.Overrides().addOverride('MessageSource', source, WindowAttentionSourceCommon); source._init(app, window); Main.messageTray.add(source); diff --git a/extensions/45/vertical-workspaces/lib/windowManager.js b/extensions/45/vertical-workspaces/lib/windowManager.js index dd467cb..a6f9b09 100644 --- a/extensions/45/vertical-workspaces/lib/windowManager.js +++ b/extensions/45/vertical-workspaces/lib/windowManager.js @@ -3,7 +3,7 @@ * windowManager.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -16,6 +16,10 @@ import GObject from 'gi://GObject'; import * as Main from 'resource:///org/gnome/shell/ui/main.js'; import * as WindowManager from 'resource:///org/gnome/shell/ui/windowManager.js'; +import * as WorkspaceAnimation from 'resource:///org/gnome/shell/ui/workspaceAnimation.js'; + +const MINIMIZE_WINDOW_ANIMATION_TIME = 400; // windowManager.MINIMIZE_WINDOW_ANIMATION_TIME +const MINIMIZE_WINDOW_ANIMATION_MODE = Clutter.AnimationMode.EASE_OUT_EXPO; // WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE let Me; let opt; @@ -62,6 +66,8 @@ export const WindowManagerModule = class { this._overrides = new Me.Util.Overrides(); this._overrides.addOverride('WindowManager', WindowManager.WindowManager.prototype, WindowManagerCommon); + if (opt.WS_SWITCHER_CURRENT_MONITOR) + this._overrides.addOverride('WorkspaceAnimationController', WorkspaceAnimation.WorkspaceAnimationController.prototype, WorkspaceAnimationController); if (!this._minimizeSigId) { this._originalMinimizeSigId = GObject.signal_handler_find(Main.wm._shellwm, { signalId: 'minimize' }); @@ -106,11 +112,108 @@ export const WindowManagerModule = class { } }; -// fix for mainstream bug - fullscreen windows should minimize using opacity transition -// but its being applied directly on window actor and that doesn't work -// anyway, animation is better, even if the Activities button is not visible... -// and also add support for bottom position of the panel const WindowManagerCommon = { + actionMoveWorkspace(workspace) { + if (!Main.sessionMode.hasWorkspaces) + return; + + if (opt.WS_SWITCHER_CURRENT_MONITOR) + this._switchWorkspaceCurrentMonitor(workspace); + else if (!workspace.active) + workspace.activate(global.get_current_time()); + }, + + actionMoveWindow(window, workspace) { + if (!Main.sessionMode.hasWorkspaces) + return; + + if (!workspace.active) { + // This won't have any effect for "always sticky" windows + // (like desktop windows or docks) + + this._workspaceAnimation.movingWindow = window; + window.change_workspace(workspace); + + global.display.clear_mouse_mode(); + + if (opt.SWITCH_ONLY_CURRENT_MONITOR_WS) { + this._switchWorkspaceCurrentMonitor(workspace, window.get_monitor()); + window.activate(global.get_current_time()); + } else { + workspace.activate_with_focus(window, global.get_current_time()); + } + } + }, + + _switchWorkspaceCurrentMonitor(workspace, monitor) { + // const focusedWindow = global.display.get_focus_window(); + // const currentMonitor = focusedWindow ? focusedWindow.get_monitor() : global.display.get_current_monitor(); + // using focused window to determine the current monitor can lead to inconsistent behavior and switching monitors between switches + // depending on which window takes focus on each workspace + // mouse pointer is more stable and predictable source + const currentMonitor = monitor ? monitor : global.display.get_current_monitor(); + const primaryMonitor = currentMonitor === Main.layoutManager.primaryIndex; + const nMonitors = Main.layoutManager.monitors.length; + const lastIndexCorrection = Meta.prefs_get_dynamic_workspaces() ? 2 : 1; + const lastIndex = global.workspaceManager.get_n_workspaces() - lastIndexCorrection; + const targetWsIndex = workspace.index(); + const activeWs = global.workspaceManager.get_active_workspace(); + const activeWsIndex = activeWs.index(); + const diff = activeWsIndex - targetWsIndex; + + let direction = diff > 0 ? Meta.MotionDirection.UP : Meta.MotionDirection.DOWN; + if (diff === 0) { + // no actual ws to switch, but secondary monitors are always in wraparound mode so we need to get direction + direction = activeWsIndex >= lastIndex ? Meta.MotionDirection.DOWN : Meta.MotionDirection.UP; + } + if (Math.abs(diff) > 1) { + // workspace is probably in wraparound mode and just wrapped so so we need to translate direction + direction = diff > 0 ? Meta.MotionDirection.DOWN : Meta.MotionDirection.UP; + } + + if (!primaryMonitor) { + this._rotateWorkspaces(direction, currentMonitor); + return; + } + + // avoid ws rotations if the last empty dynamic workspace is involved, but allow to rotate from the last to the first, if wraparound is enabled + if (workspace !== activeWs && !((targetWsIndex > lastIndex && direction === Meta.MotionDirection.DOWN) || (activeWsIndex > lastIndex && targetWsIndex >= lastIndex))) { + for (let i = 0; i < nMonitors; i++) { + if (i !== currentMonitor) { + const oppositeDirection = direction === Meta.MotionDirection.UP ? Meta.MotionDirection.DOWN : Meta.MotionDirection.UP; + this._rotateWorkspaces(oppositeDirection, i); + } + } + } + workspace.activate(global.get_current_time()); + }, + + _rotateWorkspaces(direction = 0, monitorIndex = -1, step = 1) { + step = direction === Meta.MotionDirection.UP ? Number(step) : -step; + const monitor = monitorIndex > -1 ? monitorIndex : global.display.get_current_monitor(); + // don't move windows to the last empty workspace if dynamic workspaces are enabled + const lastIndexCorrection = Meta.prefs_get_dynamic_workspaces() ? 2 : 1; + const lastIndex = global.workspaceManager.get_n_workspaces() - lastIndexCorrection; + let windows = Me.Util.getWindows(null); + for (let win of windows.reverse()) { + // avoid moving modal windows as they move with their parents (and vice versa) immediately, before we move the parent window. + if (win.get_monitor() === monitor && !win.is_always_on_all_workspaces() && !win.is_attached_dialog() && !win.get_transient_for()) { + let wWs = win.get_workspace().index(); + wWs += step; + if (wWs < 0) + wWs = lastIndex; + if (wWs > lastIndex) + wWs = 0; + const ws = global.workspaceManager.get_workspace_by_index(wWs); + win.change_workspace(ws); + } + } + }, + + // fix for mainstream bug - fullscreen windows should minimize using opacity transition + // but its being applied directly on window actor and that doesn't work + // anyway, animation is better, even if the Activities button is not visible... + // and also add support for bottom position of the panel _minimizeWindow(shellwm, actor) { const types = [ Meta.WindowType.NORMAL, @@ -129,8 +232,8 @@ const WindowManagerCommon = { /* if (actor.meta_window.is_monitor_sized()) { actor.get_first_child().ease({ opacity: 0, - duration: WindowManager.MINIMIZE_WINDOW_ANIMATION_TIME, - mode: WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, onStopped: () => this._minimizeWindowDone(shellwm, actor), }); } else { */ @@ -160,8 +263,8 @@ const WindowManagerCommon = { scale_y: yScale, x: xDest, y: yDest, - duration: WindowManager.MINIMIZE_WINDOW_ANIMATION_TIME, - mode: WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, onStopped: () => this._minimizeWindowDone(shellwm, actor), }); // } @@ -196,8 +299,8 @@ const WindowManagerCommon = { actor.set_scale(1.0, 1.0); actor.ease({ opacity: 255, - duration: WindowManager.MINIMIZE_WINDOW_ANIMATION_TIME, - mode: WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, onStopped: () => this._unminimizeWindowDone(shellwm, actor), }); } else { */ @@ -228,10 +331,50 @@ const WindowManagerCommon = { scale_y: 1, x: xDest, y: yDest, - duration: WindowManager.MINIMIZE_WINDOW_ANIMATION_TIME, - mode: WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, onStopped: () => this._unminimizeWindowDone(shellwm, actor), }); // } }, }; + +const WorkspaceAnimationController = { + _prepareWorkspaceSwitch(workspaceIndices) { + if (this._switchData) + return; + + const workspaceManager = global.workspace_manager; + const nWorkspaces = workspaceManager.get_n_workspaces(); + + const switchData = {}; + + this._switchData = switchData; + switchData.monitors = []; + + switchData.gestureActivated = false; + switchData.inProgress = false; + + if (!workspaceIndices) + workspaceIndices = [...Array(nWorkspaces).keys()]; + + let monitors = opt.WS_SWITCHER_CURRENT_MONITOR + ? [Main.layoutManager.currentMonitor] : Main.layoutManager.monitors; + monitors = Meta.prefs_get_workspaces_only_on_primary() + ? [Main.layoutManager.primaryMonitor] : monitors; + + for (const monitor of monitors) { + if (Meta.prefs_get_workspaces_only_on_primary() && + monitor.index !== Main.layoutManager.primaryIndex) + continue; + + const group = new WorkspaceAnimation.MonitorGroup(monitor, workspaceIndices, this.movingWindow); + + Main.uiGroup.insert_child_above(group, global.window_group); + + switchData.monitors.push(group); + } + + Meta.disable_unredirect_for_display(global.display); + }, +}; diff --git a/extensions/45/vertical-workspaces/lib/windowPreview.js b/extensions/45/vertical-workspaces/lib/windowPreview.js index c775d37..3253aa5 100644 --- a/extensions/45/vertical-workspaces/lib/windowPreview.js +++ b/extensions/45/vertical-workspaces/lib/windowPreview.js @@ -3,7 +3,7 @@ * windowPreview.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -173,9 +173,9 @@ const WindowPreviewCommon = { } else if (opt.WIN_PREVIEW_SEC_BTN_ACTION === 2) { this._searchAppWindowsAction(); return Clutter.EVENT_STOP; - } else if (opt.WIN_PREVIEW_SEC_BTN_ACTION === 3 && opt.WINDOW_THUMBNAIL_ENABLED) { + } else if (opt.WIN_PREVIEW_SEC_BTN_ACTION === 3 && global.windowThumbnails) { this._removeLaters(); - Me.Modules.winTmbModule.createThumbnail(metaWindow); + global.windowThumbnails?.createThumbnail(metaWindow); return Clutter.EVENT_STOP; } } else if (button === Clutter.BUTTON_MIDDLE) { @@ -185,9 +185,9 @@ const WindowPreviewCommon = { } else if (opt.WIN_PREVIEW_MID_BTN_ACTION === 2) { this._searchAppWindowsAction(); return Clutter.EVENT_STOP; - } else if (opt.WIN_PREVIEW_SEC_BTN_ACTION === 3 && opt.WINDOW_THUMBNAIL_ENABLED) { + } else if (opt.WIN_PREVIEW_SEC_BTN_ACTION === 3 && global.windowThumbnails) { this._removeLaters(); - Me.Modules.winTmbModule.createThumbnail(metaWindow); + global.windowThumbnails?.createThumbnail(metaWindow); return Clutter.EVENT_STOP; } } @@ -262,9 +262,9 @@ const WindowPreviewCommon = { if (opt.WINDOW_ICON_CLICK_ACTION === 1) { this._searchAppWindowsAction(); return Clutter.EVENT_STOP; - } else if (opt.WINDOW_ICON_CLICK_ACTION === 2 && opt.WINDOW_THUMBNAIL_ENABLED) { + } else if (opt.WINDOW_ICON_CLICK_ACTION === 2 && global.windowThumbnails) { this._removeLaters(); - Me.Modules.winTmbModule.createThumbnail(metaWindow); + global.windowThumbnails?.createThumbnail(metaWindow); return Clutter.EVENT_STOP; } } /* else if (act.get_button() === Clutter.BUTTON_SECONDARY) { @@ -458,12 +458,12 @@ const WindowPreviewCommon = { // in static workspace mode show icon and title on windows expose if (opt.OVERVIEW_MODE) { if (currentState === 1) - scale = opt.WORKSPACE_MODE; - else if (finalState === 1 || (finalState === 0 && !opt.WORKSPACE_MODE)) + scale = this._workspace._background._stateAdjustment.value; + else if ((finalState === 1 && !opt.WORKSPACE_MODE) || (finalState === 0 && !opt.WORKSPACE_MODE)) return; } - if (!opt.WS_ANIMATION && (Main.overview._overview.controls._searchController.searchActive || + if (!opt.WS_ANIMATION && (Main.overview.searchController.searchActive || ((initialState === ControlsState.WINDOW_PICKER && finalState === ControlsState.APP_GRID) || (initialState === ControlsState.APP_GRID && finalState === ControlsState.WINDOW_PICKER))) ) diff --git a/extensions/45/vertical-workspaces/lib/windowSearchProvider.js b/extensions/45/vertical-workspaces/lib/windowSearchProvider.js deleted file mode 100644 index 7deddb6..0000000 --- a/extensions/45/vertical-workspaces/lib/windowSearchProvider.js +++ /dev/null @@ -1,331 +0,0 @@ -/** - * V-Shell (Vertical Workspaces) - * windowSearchProvider.js - * - * @author GdH <G-dH@github.com> - * @copyright 2022 -2023 - * @license GPL-3.0 - */ - -'use strict'; - -import Gio from 'gi://Gio'; -import GLib from 'gi://GLib'; -import Meta from 'gi://Meta'; -import Shell from 'gi://Shell'; -import St from 'gi://St'; - -import * as Main from 'resource:///org/gnome/shell/ui/main.js'; - -let Me; -let opt; -// gettext -let _; - -// prefix helps to eliminate results from other search providers -// so it needs to be something less common -// needs to be accessible from vw module -export const PREFIX = 'wq//'; - -const Action = { - NONE: 0, - CLOSE: 1, - CLOSE_ALL: 2, - MOVE_TO_WS: 3, - MOVE_ALL_TO_WS: 4, -}; - -export const WindowSearchProviderModule = class { - // export for other modules - static _PREFIX = PREFIX; - constructor(me) { - Me = me; - opt = Me.opt; - _ = Me.gettext; - - this._firstActivation = true; - this.moduleEnabled = false; - - this._windowSearchProvider = null; - this._enableTimeoutId = 0; - } - - cleanGlobals() { - Me = null; - opt = null; - _ = null; - } - - update(reset) { - this.moduleEnabled = opt.get('windowSearchProviderModule'); - - reset = reset || !this.moduleEnabled; - - if (reset && !this._firstActivation) { - this._disableModule(); - } else if (!reset) { - this._firstActivation = false; - this._activateModule(); - } - if (reset && this._firstActivation) - console.debug(' WindowSearchProviderModule - Keeping untouched'); - } - - _activateModule() { - // delay because Fedora had problem to register a new provider soon after Shell restarts - this._enableTimeoutId = GLib.timeout_add( - GLib.PRIORITY_DEFAULT, - 2000, - () => { - if (!this._windowSearchProvider) { - this._windowSearchProvider = new WindowSearchProvider(opt); - this._getOverviewSearchResult()._registerProvider(this._windowSearchProvider); - } - this._enableTimeoutId = 0; - return GLib.SOURCE_REMOVE; - } - ); - console.debug(' WindowSearchProviderModule - Activated'); - } - - _disableModule() { - if (this._windowSearchProvider) { - this._getOverviewSearchResult()._unregisterProvider(this._windowSearchProvider); - this._windowSearchProvider = null; - } - if (this._enableTimeoutId) { - GLib.source_remove(this._enableTimeoutId); - this._enableTimeoutId = 0; - } - - console.debug(' WindowSearchProviderModule - Disabled'); - } - - _getOverviewSearchResult() { - return Main.overview._overview.controls._searchController._searchResults; - } -}; - -/* const closeSelectedRegex = /^\/x!$/; -const closeAllResultsRegex = /^\/xa!$/; -const moveToWsRegex = /^\/m[0-9]+$/; -const moveAllToWsRegex = /^\/ma[0-9]+$/;*/ - -class WindowSearchProvider { - constructor() { - this.id = 'open-windows'; - // use arbitrary app to get complete appInfo object - // Gio.AppInfo.create_from_commandline lacks something that causes error with parental content / malcontent - const appSystem = Shell.AppSystem.get_default(); - let appInfo = appSystem.lookup_app('com.matjakeman.ExtensionManager.desktop')?.get_app_info(); - if (!appInfo) - appInfo = appSystem.lookup_app('org.gnome.Extensions.desktop')?.get_app_info(); - if (!appInfo) - appInfo = Gio.AppInfo.create_from_commandline('true', _('Open Windows'), null); - appInfo.get_description = () => _('Search open windows'); - appInfo.get_name = () => _('Open Windows'); - appInfo.get_id = () => this.id; - appInfo.get_icon = () => Gio.icon_new_for_string('focus-windows-symbolic'); - appInfo.should_show = () => true; - - this.appInfo = appInfo; - this.canLaunchSearch = false; - this.isRemoteProvider = false; - - this.action = 0; - } - - _getResultSet(terms) { - // do not modify original terms - let termsCopy = [...terms]; - // search for terms without prefix - termsCopy[0] = termsCopy[0].replace(PREFIX, ''); - - /* if (gOptions.get('searchWindowsCommands')) { - this.action = 0; - this.targetWs = 0; - - const lastTerm = terms[terms.length - 1]; - if (lastTerm.match(closeSelectedRegex)) { - this.action = Action.CLOSE; - } else if (lastTerm.match(closeAllResultsRegex)) { - this.action = Action.CLOSE_ALL; - } else if (lastTerm.match(moveToWsRegex)) { - this.action = Action.MOVE_TO_WS; - } else if (lastTerm.match(moveAllToWsRegex)) { - this.action = Action.MOVE_ALL_TO_WS; - } - if (this.action) { - terms.pop(); - if (this.action === Action.MOVE_TO_WS || this.action === Action.MOVE_ALL_TO_WS) { - this.targetWs = parseInt(lastTerm.replace(/^[^0-9]+/, '')) - 1; - } - } else if (lastTerm.startsWith('/')) { - terms.pop(); - } - }*/ - - const candidates = this.windows; - const _terms = [].concat(termsCopy); - // let match; - - const term = _terms.join(' '); - /* match = s => { - return fuzzyMatch(term, s); - }; */ - - const results = []; - let m; - for (let key in candidates) { - if (opt.SEARCH_FUZZY) - m = Me.Util.fuzzyMatch(term, candidates[key].name); - else - m = Me.Util.strictMatch(term, candidates[key].name); - - if (m !== -1) - results.push({ weight: m, id: key }); - } - - results.sort((a, b) => a.weight > b.weight); - const currentWs = global.workspace_manager.get_active_workspace_index(); - // prefer current workspace - switch (opt.WINDOW_SEARCH_ORDER) { - case 1: // MRU - current ws first - results.sort((a, b) => (this.windows[a.id].window.get_workspace().index() !== currentWs) && (this.windows[b.id].window.get_workspace().index() === currentWs)); - break; - case 2: // MRU - by workspace - results.sort((a, b) => this.windows[a.id].window.get_workspace().index() > this.windows[b.id].window.get_workspace().index()); - break; - case 3: // Stable sequence - by workspace - results.sort((a, b) => this.windows[a.id].window.get_stable_sequence() > this.windows[b.id].window.get_stable_sequence()); - results.sort((a, b) => this.windows[a.id].window.get_workspace().index() > this.windows[b.id].window.get_workspace().index()); - break; - } - - results.sort((a, b) => (_terms !== ' ') && (a.weight > 0 && b.weight === 0)); - - this.resultIds = results.map(item => item.id); - return this.resultIds; - } - - getResultMetas(resultIds/* , callback = null*/) { - const metas = resultIds.map(id => this.getResultMeta(id)); - return new Promise(resolve => resolve(metas)); - } - - getResultMeta(resultId) { - const result = this.windows[resultId]; - const wsIndex = result.window.get_workspace().index(); - const app = Shell.WindowTracker.get_default().get_window_app(result.window); - return { - 'id': resultId, - 'name': `${wsIndex + 1}: ${result.windowTitle}`, - 'description': result.appName, - 'createIcon': size => { - return app - ? app.create_icon_texture(size) - : new St.Icon({ icon_name: 'icon-missing', icon_size: size }); - }, - }; - } - - makeResult(window, i) { - const app = Shell.WindowTracker.get_default().get_window_app(window); - const appName = app ? app.get_name() : 'Unknown'; - const windowTitle = window.get_title(); - const wsIndex = window.get_workspace().index(); - - return { - 'id': i, - // convert all accented chars to their basic form and lower case for search - 'name': `${wsIndex + 1}: ${windowTitle} ${appName}`.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(), - appName, - windowTitle, - window, - }; - } - - launchSearch(/* terms, timeStamp*/) { - - } - - activateResult(resultId/* , terms, timeStamp*/) { - const isCtrlPressed = Me.Util.isCtrlPressed(); - const isShiftPressed = Me.Util.isShiftPressed(); - - this.action = 0; - this.targetWs = 0; - - this.targetWs = global.workspaceManager.get_active_workspace().index() + 1; - if (isShiftPressed && !isCtrlPressed) - this.action = Action.MOVE_TO_WS; - else if (isShiftPressed && isCtrlPressed) - this.action = Action.MOVE_ALL_TO_WS; - - - if (!this.action) { - const result = this.windows[resultId]; - Main.activateWindow(result.window); - return; - } - - switch (this.action) { - case Action.CLOSE: - this._closeWindows([resultId]); - break; - case Action.CLOSE_ALL: - this._closeWindows(this.resultIds); - break; - case Action.MOVE_TO_WS: - this._moveWindowsToWs(resultId, [resultId]); - break; - case Action.MOVE_ALL_TO_WS: - this._moveWindowsToWs(resultId, this.resultIds); - break; - } - } - - _closeWindows(ids) { - let time = global.get_current_time(); - for (let i = 0; i < ids.length; i++) - this.windows[ids[i]].window.delete(time + i); - - Main.notify('Window Search Provider', `Closed ${ids.length} windows.`); - } - - _moveWindowsToWs(selectedId, resultIds) { - const workspace = global.workspaceManager.get_active_workspace(); - - for (let i = 0; i < resultIds.length; i++) - this.windows[resultIds[i]].window.change_workspace(workspace); - - const selectedWin = this.windows[selectedId].window; - selectedWin.activate_with_workspace(global.get_current_time(), workspace); - } - - getInitialResultSet(terms/* , callback*/) { - let windows; - this.windows = windows = {}; - global.display.get_tab_list(Meta.TabList.NORMAL, null).filter(w => w.get_workspace() !== null).map( - (v, i) => { - windows[`${i}-${v.get_id()}`] = this.makeResult(v, `${i}-${v.get_id()}`); - return windows[`${i}-${v.get_id()}`]; - } - ); - - return new Promise(resolve => resolve(this._getResultSet(terms))); - } - - filterResults(results /* , maxResults*/) { - // return results.slice(0, maxResults); - return results; - } - - getSubsearchResultSet(previousResults, terms/* , callback*/) { - return this.getInitialResultSet(terms); - } - - getSubsearchResultSet42(terms, callback) { - callback(this._getResultSet(terms)); - } -} diff --git a/extensions/45/vertical-workspaces/lib/workspace.js b/extensions/45/vertical-workspaces/lib/workspace.js index 1ff81f1..679a1ab 100644 --- a/extensions/45/vertical-workspaces/lib/workspace.js +++ b/extensions/45/vertical-workspaces/lib/workspace.js @@ -3,7 +3,7 @@ * workspace.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/workspaceAnimation.js b/extensions/45/vertical-workspaces/lib/workspaceAnimation.js index 32c7df1..e29e3ef 100644 --- a/extensions/45/vertical-workspaces/lib/workspaceAnimation.js +++ b/extensions/45/vertical-workspaces/lib/workspaceAnimation.js @@ -3,7 +3,7 @@ * workspacesAnimation.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ diff --git a/extensions/45/vertical-workspaces/lib/workspaceSwitcherPopup.js b/extensions/45/vertical-workspaces/lib/workspaceSwitcherPopup.js index 358bb1f..cf3d4c1 100644 --- a/extensions/45/vertical-workspaces/lib/workspaceSwitcherPopup.js +++ b/extensions/45/vertical-workspaces/lib/workspaceSwitcherPopup.js @@ -3,7 +3,7 @@ * workspacesSwitcherPopup.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -73,6 +73,7 @@ const WorkspaceSwitcherPopupCommon = { after__init() { if (opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL this._list.vertical = true; + this._list.add_style_class_name('ws-switcher-vertical'); } this._list.set_style('margin: 0;'); if (this.get_constraints()[0]) @@ -89,13 +90,11 @@ const WorkspaceSwitcherPopupCommon = { _setPopupPosition() { let workArea; - if (opt.WS_SW_POPUP_MODE === 1) { - // workArea = Main.layoutManager.getWorkAreaForMonitor(Main.layoutManager.primaryIndex);*/ + if (opt.WS_SW_POPUP_MODE === 1) workArea = global.display.get_monitor_geometry(Main.layoutManager.primaryIndex); - } else { - // workArea = Main.layoutManager.getWorkAreaForMonitor(global.display.get_current_monitor()); + else workArea = global.display.get_monitor_geometry(global.display.get_current_monitor()); - } + let [, natHeight] = this.get_preferred_height(global.screen_width); let [, natWidth] = this.get_preferred_width(natHeight); diff --git a/extensions/45/vertical-workspaces/lib/workspaceThumbnail.js b/extensions/45/vertical-workspaces/lib/workspaceThumbnail.js index 75e5250..d64fda2 100644 --- a/extensions/45/vertical-workspaces/lib/workspaceThumbnail.js +++ b/extensions/45/vertical-workspaces/lib/workspaceThumbnail.js @@ -3,7 +3,7 @@ * workspaceThumbnail.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -335,7 +335,7 @@ const WorkspaceThumbnailCommon = { // in OVERVIEW MODE 2 windows are not spread and workspace is not scaled // we need to repeat transition to the overview state 1 (window picker), but with spreading windows animation if (this.metaWorkspace.active) { - Main.overview._overview.controls._searchController._setSearchActive(false); + Main.overview.searchController._setSearchActive(false); opt.WORKSPACE_MODE = 1; // setting value to 0 would reset WORKSPACE_MODE stateAdjustment.value = 0.01; diff --git a/extensions/45/vertical-workspaces/lib/workspacesView.js b/extensions/45/vertical-workspaces/lib/workspacesView.js index 98b3062..8e20db3 100644 --- a/extensions/45/vertical-workspaces/lib/workspacesView.js +++ b/extensions/45/vertical-workspaces/lib/workspacesView.js @@ -3,7 +3,7 @@ * workspacesView.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 * */ @@ -263,6 +263,7 @@ const WorkspacesViewCommon = { adjustments.push(this._workspaces[workspaceIndex]._background._stateAdjustment); } + opt.WORKSPACE_MODE = 1; adjustments.forEach(adj => { if (adj.value === 0) { adj.value = 0; @@ -270,7 +271,6 @@ const WorkspacesViewCommon = { duration: 200, mode: Clutter.AnimationMode.EASE_OUT_QUAD, onComplete: () => { - opt.WORKSPACE_MODE = 1; if (callback) callback(); }, @@ -333,12 +333,13 @@ const SecondaryMonitorDisplayVertical = { Math.round(scaledWidth)); }, - _getWorkspacesBoxForState(state, box, padding, thumbnailsWidth, spacing) { + _getWorkspacesBoxForState(state, box, thumbnailsWidth, spacing, startY, panelHeight) { // const { ControlsState } = OverviewControls; const workspaceBox = box.copy(); - const [width, height] = workspaceBox.get_size(); + let [width, height] = workspaceBox.get_size(); + height -= panelHeight; - let wWidth, wHeight, wsbX, wsbY, offset, yShift; + let wWidth, wHeight, wsbX, wsbY, offset; switch (state) { case ControlsState.HIDDEN: break; @@ -347,16 +348,8 @@ const SecondaryMonitorDisplayVertical = { if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) break; - yShift = 0; - if (opt.SEC_WS_PREVIEW_SHIFT && !opt.PANEL_DISABLED) { - if (opt.PANEL_POSITION_TOP) - yShift = Main.panel.height; - else - yShift = -Main.panel.height; - } - wWidth = width - thumbnailsWidth - 5 * spacing; - wHeight = Math.min(wWidth / (width / height) - Math.abs(yShift), height - 4 * spacing); + wHeight = Math.min(wWidth / (width / height), height - 4 * spacing); wWidth = Math.round(wWidth * opt.SEC_WS_PREVIEW_SCALE); wHeight = Math.round(wHeight * opt.SEC_WS_PREVIEW_SCALE); @@ -366,7 +359,7 @@ const SecondaryMonitorDisplayVertical = { else wsbX = offset; - wsbY = Math.round((height - wHeight - Math.abs(yShift)) / 2 + yShift); + wsbY = Math.round((startY + height - wHeight) / 2); workspaceBox.set_origin(wsbX, wsbY); workspaceBox.set_size(wWidth, wHeight); @@ -381,24 +374,31 @@ const SecondaryMonitorDisplayVertical = { const themeNode = this.get_theme_node(); const contentBox = themeNode.get_content_box(box); - const [width, height] = contentBox.get_size(); + let [width, height] = contentBox.get_size(); + let [, startY] = contentBox.get_origin(); + // Save some resources + if (this._startY === undefined) { + this._panelHeight = opt.SEC_WS_PREVIEW_SHIFT && Main.panel.visible ? Main.panel.height : 0; + startY += opt.SEC_WS_PREVIEW_SHIFT && opt.PANEL_POSITION_TOP ? this._panelHeight : 0; + this._startY = startY; + } + + startY = this._startY; + height -= this._panelHeight; const { expandFraction } = this._thumbnails; const spacing = themeNode.get_length('spacing') * expandFraction; - const padding = Math.round(0.1 * height); let thumbnailsWidth = 0; let thumbnailsHeight = 0; this._thumbnails.visible = !opt.SEC_WS_TMB_HIDDEN; if (this._thumbnails.visible) { - const reduceBoxHeight = opt.SEC_WS_PREVIEW_SHIFT && Main.panel.visible ? Main.panel.height : 0; - - thumbnailsWidth = width * opt.SEC_MAX_THUMBNAIL_SCALE; + thumbnailsWidth = Math.round(width * opt.SEC_MAX_THUMBNAIL_SCALE); let totalTmbSpacing; [totalTmbSpacing, thumbnailsHeight] = this._thumbnails.get_preferred_height(thumbnailsWidth); thumbnailsHeight = Math.round(thumbnailsHeight + totalTmbSpacing); - const thumbnailsHeightMax = height - spacing - reduceBoxHeight; + const thumbnailsHeightMax = height - spacing; if (thumbnailsHeight > thumbnailsHeightMax) { thumbnailsHeight = thumbnailsHeightMax; @@ -406,11 +406,11 @@ const SecondaryMonitorDisplayVertical = { } let wsTmbX; - if (opt.SEC_WS_TMB_LEFT) { // left - wsTmbX = spacing / 2; + if (opt.SEC_WS_TMB_LEFT) { + wsTmbX = 0; this._thumbnails._positionLeft = true; } else { - wsTmbX = width - spacing / 2 - thumbnailsWidth; + wsTmbX = width - thumbnailsWidth; this._thumbnails._positionLeft = false; } @@ -418,8 +418,9 @@ const SecondaryMonitorDisplayVertical = { const availSpace = height - thumbnailsHeight; let wsTmbY = availSpace / 2; - wsTmbY -= opt.SEC_WS_TMB_POSITION_ADJUSTMENT * wsTmbY; - wsTmbY += opt.SEC_WS_PREVIEW_SHIFT && Main.panel.visible ? Main.panel.height : 0; + + wsTmbY -= opt.SEC_WS_TMB_POSITION_ADJUSTMENT * (wsTmbY - spacing / 2); + wsTmbY += startY; childBox.set_origin(Math.round(wsTmbX), Math.round(wsTmbY)); childBox.set_size(thumbnailsWidth, thumbnailsHeight); @@ -431,7 +432,7 @@ const SecondaryMonitorDisplayVertical = { } = this._overviewAdjustment.getStateTransitionParams(); let workspacesBox; - const workspaceParams = [contentBox, padding, thumbnailsWidth, spacing]; + const workspaceParams = [contentBox, thumbnailsWidth, spacing, startY, this._panelHeight]; if (!transitioning) { workspacesBox = this._getWorkspacesBoxForState(currentState, ...workspaceParams); @@ -561,12 +562,13 @@ const SecondaryMonitorDisplayHorizontal = { return { opacity, scale, translationY }; }, - _getWorkspacesBoxForState(state, box, padding, thumbnailsHeight, spacing) { + _getWorkspacesBoxForState(state, box, thumbnailsHeight, spacing, startY, panelHeight) { // const { ControlsState } = OverviewControls; const workspaceBox = box.copy(); - const [width, height] = workspaceBox.get_size(); + let [width, height] = workspaceBox.get_size(); + height -= panelHeight; - let wWidth, wHeight, wsbX, wsbY, offset, yShift; + let wWidth, wHeight, wsbX, wsbY, offset; switch (state) { case ControlsState.HIDDEN: break; @@ -575,26 +577,18 @@ const SecondaryMonitorDisplayHorizontal = { if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) break; - yShift = 0; - if (opt.SEC_WS_PREVIEW_SHIFT && !opt.PANEL_DISABLED) { - if (opt.PANEL_POSITION_TOP) - yShift = Main.panel.height; - else - yShift = -Main.panel.height; - } - - wHeight = height - Math.abs(yShift) - (thumbnailsHeight ? thumbnailsHeight + 4 * spacing : padding); + wHeight = height - (thumbnailsHeight ? thumbnailsHeight + 4 * spacing : 4 * spacing); wWidth = Math.min(wHeight * (width / height), width - 5 * spacing); wWidth = Math.round(wWidth * opt.SEC_WS_PREVIEW_SCALE); wHeight = Math.round(wHeight * opt.SEC_WS_PREVIEW_SCALE); - offset = Math.round((height - thumbnailsHeight - wHeight - Math.abs(yShift)) / 2); + offset = Math.round((height - thumbnailsHeight - wHeight) / 2); if (opt.SEC_WS_TMB_TOP) wsbY = thumbnailsHeight + offset; else wsbY = offset; - wsbY += yShift; + wsbY += startY; wsbX = Math.round((width - wWidth) / 2); workspaceBox.set_origin(wsbX, wsbY); @@ -610,17 +604,24 @@ const SecondaryMonitorDisplayHorizontal = { const themeNode = this.get_theme_node(); const contentBox = themeNode.get_content_box(box); - const [width, height] = contentBox.get_size(); + let [width, height] = contentBox.get_size(); + let [, startY] = contentBox.get_origin(); + // Save some resources + if (this._startY === undefined) { + this._panelHeight = opt.SEC_WS_PREVIEW_SHIFT && Main.panel.visible ? Main.panel.height : 0; + startY += opt.SEC_WS_PREVIEW_SHIFT && opt.PANEL_POSITION_TOP ? this._panelHeight : 0; + this._startY = startY; + } + startY = this._startY; + height -= this._panelHeight; + const { expandFraction } = this._thumbnails; const spacing = themeNode.get_length('spacing') * expandFraction; - const padding = Math.round(0.1 * height); let thumbnailsWidth = 0; let thumbnailsHeight = 0; this._thumbnails.visible = !opt.SEC_WS_TMB_HIDDEN; if (this._thumbnails.visible) { - const reservedHeight = opt.SEC_WS_PREVIEW_SHIFT && Main.panel.visible ? Main.panel.height : 0; - thumbnailsHeight = height * opt.SEC_MAX_THUMBNAIL_SCALE; let totalTmbSpacing; @@ -636,9 +637,9 @@ const SecondaryMonitorDisplayHorizontal = { let wsTmbY; if (opt.SEC_WS_TMB_TOP) - wsTmbY = spacing / 2 + reservedHeight; + wsTmbY = spacing / 2 + startY; else - wsTmbY = height - spacing / 2 - thumbnailsHeight; + wsTmbY = height - spacing / 2 - thumbnailsHeight + startY; const childBox = new Clutter.ActorBox(); const availSpace = width - thumbnailsWidth; @@ -656,7 +657,7 @@ const SecondaryMonitorDisplayHorizontal = { } = this._overviewAdjustment.getStateTransitionParams(); let workspacesBox; - const workspaceParams = [contentBox, padding, thumbnailsHeight, spacing]; + const workspaceParams = [contentBox, thumbnailsHeight, spacing, startY, this._panelHeight]; if (!transitioning) { workspacesBox = this._getWorkspacesBoxForState(currentState, ...workspaceParams); @@ -759,14 +760,12 @@ const ExtraWorkspaceViewCommon = { exposeWindows() { const adjustment = this._workspace._background._stateAdjustment; + opt.WORKSPACE_MODE = 1; if (adjustment.value === 0) { adjustment.value = 0; adjustment.ease(1, { duration: 200, mode: Clutter.AnimationMode.EASE_OUT_QUAD, - onComplete: () => { - opt.WORKSPACE_MODE = 1; - }, }); } }, @@ -805,7 +804,7 @@ const WorkspacesDisplayCommon = { upper: 0, // FitMode.SINGLE, }), this._overviewAdjustment); - Main.layoutManager.overviewGroup.add_actor(view); + Main.layoutManager.overviewGroup.add_child(view); } this._workspacesViews.push(view); @@ -906,15 +905,15 @@ const WorkspacesDisplayCommon = { break; case Clutter.KEY_space: if (Me.Util.isCtrlPressed() && Me.Util.isShiftPressed()) { - Me.Util.activateSearchProvider(Me.ESP_PREFIX); + Me.Util.openPreferences(); } else if (Me.Util.isAltPressed()) { Main.ctrlAltTabManager._items.forEach(i => { if (i.sortGroup === 1 && i.name === 'Dash') Main.ctrlAltTabManager.focusGroup(i); }); - } else if (opt.get('recentFilesSearchProviderModule') && Me.Util.isCtrlPressed()) { - Me.Util.activateSearchProvider(Me.RFSP_PREFIX); - } else if (opt.get('windowSearchProviderModule')) { + } else if (Me.Util.getEnabledExtensions('extensions-search-provider').length && Me.Util.isCtrlPressed()) { + Me.Util.activateSearchProvider(Me.ESP_PREFIX); + } else if (Me.Util.getEnabledExtensions('windows-search-provider').length) { Me.Util.activateSearchProvider(Me.WSP_PREFIX); } @@ -924,7 +923,7 @@ const WorkspacesDisplayCommon = { case Clutter.KEY_Right: case Clutter.KEY_Up: case Clutter.KEY_Tab: - if (Main.overview._overview._controls._searchController.searchActive) { + if (Main.overview.searchController.searchActive) { Main.overview.searchEntry.grab_key_focus(); } else if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE && state === 1) { // expose windows by "clicking" on ws thumbnail diff --git a/extensions/45/vertical-workspaces/metadata.json b/extensions/45/vertical-workspaces/metadata.json index 895047e..163e115 100644 --- a/extensions/45/vertical-workspaces/metadata.json +++ b/extensions/45/vertical-workspaces/metadata.json @@ -3,7 +3,8 @@ "uuid": "vertical-workspaces@G-dH.github.com", "description": "Customize your GNOME Shell UX to suit your workflow, whether you like horizontally or vertically stacked workspaces.", "shell-version": [ - "45" + "45", + "46" ], "session-modes": [ "user", @@ -15,5 +16,7 @@ }, "gettext-domain": "vertical-workspaces", "settings-schema": "org.gnome.shell.extensions.vertical-workspaces", - "version-name": "45.2" + "version-name": "46.1", + "version": 999 } + diff --git a/extensions/45/vertical-workspaces/po/vertical-workspaces.pot b/extensions/45/vertical-workspaces/po/vertical-workspaces.pot index 44ccddb..84413d9 100644 --- a/extensions/45/vertical-workspaces/po/vertical-workspaces.pot +++ b/extensions/45/vertical-workspaces/po/vertical-workspaces.pot @@ -8,1382 +8,1995 @@ msgid "" msgstr "" "Project-Id-Version: vertical-workspaces\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-08 12:37+0100\n" +"POT-Creation-Date: 2024-01-06 11:42+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: dash.js:743 -msgid "Search Open Windows (Hotkey: Space)" +#: extension.js:796 +msgid "Updating V-Shell..." msgstr "" -#: dash.js:816 -msgid "Search Recent Files (Hotkey: Ctrl + Space)" +#: prefs.js:30 +msgid "Profiles" msgstr "" -#: windowSearchProvider.js:117 windowSearchProvider.js:119 -msgid "Open Windows" +#: prefs.js:36 prefs.js:2013 +msgid "Layout" msgstr "" -#: windowSearchProvider.js:118 -msgid "List of open windows" +#: prefs.js:42 +msgid "Appearance" msgstr "" -#: appDisplay.js:1317 -msgid "Force Quit" +#: prefs.js:48 +msgid "Behavior" msgstr "" -#: appDisplay.js:1335 -msgid "Move App to Current Workspace ( Shift + Click )" +#: prefs.js:54 +msgid "Modules" msgstr "" -#: prefs.js:47 prefs.js:1465 -msgid "Layout" +#: prefs.js:60 +msgid "Misc" msgstr "" -#: prefs.js:53 -msgid "Appearance" +#: prefs.js:66 +msgid "About" msgstr "" -#: prefs.js:59 -msgid "Behavior" +#: prefs.js:109 +msgid "Custom Profiles" msgstr "" -#: prefs.js:65 -msgid "Misc" +#: prefs.js:110 +msgid "Sets of settings that can help you with the initial customization" msgstr "" -#: prefs.js:71 -msgid "About" +#: prefs.js:115 +msgid "Profile 1" +msgstr "" + +#: prefs.js:121 +msgid "Profile 2" +msgstr "" + +#: prefs.js:127 +msgid "Profile 3" +msgstr "" + +#: prefs.js:133 +msgid "Profile 4" msgstr "" -#: prefs.js:119 prefs.js:517 prefs.js:1030 prefs.js:1456 +#: prefs.js:148 prefs.js:707 prefs.js:1435 prefs.js:2004 msgid "Dash" msgstr "" -#: prefs.js:125 +#: prefs.js:154 msgid "Dash Position" msgstr "" -#: prefs.js:131 +#: prefs.js:160 msgid "Top" msgstr "" -#: prefs.js:132 +#: prefs.js:161 msgid "Right" msgstr "" -#: prefs.js:133 prefs.js:355 +#: prefs.js:162 prefs.js:491 msgid "Bottom" msgstr "" -#: prefs.js:134 +#: prefs.js:163 msgid "Left" msgstr "" -#: prefs.js:135 prefs.js:393 prefs.js:557 prefs.js:572 prefs.js:587 +#: prefs.js:164 prefs.js:209 prefs.js:225 prefs.js:241 prefs.js:257 +#: prefs.js:626 msgid "Hide" msgstr "" -#: prefs.js:142 +#: prefs.js:172 msgid "Center Horizontal Dash to Workspace" msgstr "" -#: prefs.js:143 +#: prefs.js:173 msgid "" "If the Dash Position is set to Top or Bottom, the position will be " -"recalculated relative to the workspace preview instead of the screen. Works " -"only with the default Dash." +"recalculated relative to the workspace preview instead of the screen" msgstr "" -#: prefs.js:160 +#: prefs.js:192 msgid "Fine Tune Dash Position" msgstr "" -#: prefs.js:161 +#: prefs.js:193 msgid "" -"Adjusts position of the dock on chosen axis. Works only with the default " -"Dash." +"Adjusts the position of the dash on the axis given by the orientation of the " +"workspaces" msgstr "" -#: prefs.js:170 +#: prefs.js:203 +msgid "Show Apps Icon Position" +msgstr "" + +#: prefs.js:204 +msgid "Sets the position of the \"Show Applications\" icon in the Dash" +msgstr "" + +#: prefs.js:210 prefs.js:226 prefs.js:242 prefs.js:258 +msgid "Start" +msgstr "" + +#: prefs.js:211 prefs.js:227 prefs.js:243 prefs.js:259 +msgid "End" +msgstr "" + +#: prefs.js:219 +msgid "Open Windows Icon Position" +msgstr "" + +#: prefs.js:220 +msgid "" +"Allows to add \"Search Open Windows\" icon into Dash (if window search " +"provider enabled on the Modules tab) so you can directly toggle window " +"search provider results. You can also use the secondary mouse button click " +"on the Show Apps Icon, or the Space hotkey" +msgstr "" + +#: prefs.js:235 +msgid "Recent Files Icon Position" +msgstr "" + +#: prefs.js:236 +msgid "" +"Allows to add \"Search Recent Files\" icon into Dash (if recent files search " +"provider enabled on the Modules tab) so you can directly toggle recent files " +"search provider results. You can also use Ctrl + Space hotkey" +msgstr "" + +#: prefs.js:251 +msgid "Extensions Icon Position" +msgstr "" + +#: prefs.js:252 +msgid "" +"Allows to add \"Search Extensions\" icon into Dash (if extensions search " +"provider enabled on the Module tab) so you can directly toggle extensions " +"search provider results. You can also use the Ctrl + Shift + Space hotkey" +msgstr "" + +#: prefs.js:268 msgid "Workspace Thumbnails / Orientation" msgstr "" -#: prefs.js:176 +#: prefs.js:274 msgid "Thumbnails Position / Workspaces Orientation" msgstr "" -#: prefs.js:177 +#: prefs.js:275 msgid "" "Position of the workspace thumbnails on the screen also sets orientation of " "the workspaces to vertical or horizontal. You have two options to disable " -"workspace thumbnails, one sets workspaces to the vertical orientation, the " +"workspace thumbnails, one sets workspaces to vertical orientation, the " "second one to horizontal." msgstr "" -#: prefs.js:183 -msgid "Left \t Vertical Orientation" +#: prefs.js:281 +msgid "Left \t Vertical Orientation" msgstr "" -#: prefs.js:184 -msgid "Right \t Vertical Orientation" +#: prefs.js:282 +msgid "Right \t Vertical Orientation" msgstr "" -#: prefs.js:185 -msgid "Hide \t Set Vertical Orientation" +#: prefs.js:283 +msgid "Hide \t Vertical Orientation" msgstr "" -#: prefs.js:186 -msgid "Top \t Horizontal Orientation" +#: prefs.js:284 +msgid "Top \t Horizontal Orientation" msgstr "" -#: prefs.js:187 +#: prefs.js:285 msgid "Bottom \t Horizontal Orientation" msgstr "" -#: prefs.js:188 -msgid "Hide \t Set Horizontal Orientation" +#: prefs.js:286 +msgid "Hide \t Horizontal Orientation" msgstr "" -#: prefs.js:204 prefs.js:409 +#: prefs.js:302 prefs.js:642 msgid "Fine Tune Workspace Thumbnails Position" msgstr "" -#: prefs.js:205 -msgid "Adjusts workspace thumbnails vertical position." +#: prefs.js:303 prefs.js:643 +msgid "" +"Adjusts the position of the thumbnails on the axis given by the orientation " +"of the workspaces" msgstr "" -#: prefs.js:213 +#: prefs.js:311 msgid "Reserve Full Screen Height/Width for Thumbnails" msgstr "" -#: prefs.js:214 +#: prefs.js:312 msgid "" "The whole screen height/width will be reserved for workspace thumbnails at " "the expense of space available for Dash (if the Dash is oriented in a " "different axis)." msgstr "" -#: prefs.js:231 prefs.js:427 -msgid "Workspace Thumbnails Max Scale" +#: prefs.js:329 +msgid "Workspace Thumbnails Max Scale - Window Picker" msgstr "" -#: prefs.js:232 +#: prefs.js:330 msgid "" -"Adjusts maximum size of the workspace thumbnails (% relative to display " -"width)." +"Adjusts maximum size of the workspace thumbnails in the overview (% relative " +"to display width)" +msgstr "" + +#: prefs.js:347 +msgid "Workspace Thumbnails Max Scale - App View" msgstr "" -#: prefs.js:241 prefs.js:697 +#: prefs.js:348 +msgid "Allows you to set different thumbnails scale for the Applications view" +msgstr "" + +#: prefs.js:356 prefs.js:905 msgid "Workspace Preview" msgstr "" -#: prefs.js:256 +#: prefs.js:371 msgid "Workspaces Scale" msgstr "" -#: prefs.js:257 +#: prefs.js:372 msgid "" -"Scales down workspace previews so you can fit more of the adjacent " -"workspaces on the screen. Default size is calculated to use all available " -"space." +"Allows to shrink workspace previews to adjust spacing or fit more of the " +"adjacent workspaces on the screen. Default size is calculated to use all " +"available space with minimal spacing" msgstr "" -#: prefs.js:274 +#: prefs.js:389 msgid "Workspaces Spacing" msgstr "" -#: prefs.js:275 +#: prefs.js:390 msgid "" "Adjusts spacing between workspace previews so you can control how much of " "the adjacent workspaces overlap to the current workspace overview. Default " -"value should set the adjacent workspaces out of the screen." +"value should set the adjacent workspaces off-screen." msgstr "" -#: prefs.js:284 prefs.js:712 prefs.js:1072 +#: prefs.js:399 prefs.js:938 prefs.js:1590 msgid "App Grid" msgstr "" -#: prefs.js:290 +#: prefs.js:405 msgid "Center App Grid" msgstr "" -#: prefs.js:291 -msgid "" -"App grid in app view page will be centered to the display instead of the " -"available space. This option may have impact on the size of the grid, more " -"for narrower and small resolution displays, especially if workspace " -"thumbnails are bigger." +#: prefs.js:406 +msgid "Centers the app grid relative to the display instead of available space" msgstr "" -#: prefs.js:300 +#: prefs.js:423 +msgid "App Grid Page Width Scale" +msgstr "" + +#: prefs.js:424 +msgid "Adjusts max app grid page width relative to the available space." +msgstr "" + +#: prefs.js:434 msgid "Search View" msgstr "" -#: prefs.js:306 +#: prefs.js:440 msgid "Center Search View" msgstr "" -#: prefs.js:307 +#: prefs.js:441 msgid "" -"Search view will be centered to the display instead of the available space." +"Centers the search view relative to the display instead of available space" msgstr "" -#: prefs.js:315 +#: prefs.js:449 msgid "Always Show Search Entry" msgstr "" -#: prefs.js:316 +#: prefs.js:450 msgid "" "If disabled, the search entry field will be hidden when not in use, so the " -"workspace preview and app grid may take up more space." +"workspace preview and app grid may take up more space" msgstr "" -#: prefs.js:333 +#: prefs.js:467 msgid "Search Results Width" msgstr "" -#: prefs.js:334 +#: prefs.js:468 msgid "" "Adjusts maximum width of search results view (% relative to default). This " -"allows you to fit more (or less) app icons into the app search result." +"allows to fit more (or less) app icons into the app search result" msgstr "" -#: prefs.js:342 prefs.js:1483 +#: prefs.js:478 prefs.js:2049 msgid "Panel" msgstr "" -#: prefs.js:348 +#: prefs.js:484 msgid "Main Panel Position" msgstr "" -#: prefs.js:349 -msgid "Allows you to place the main panel at the bottom of your monitor." +#: prefs.js:485 +msgid "Allows to place the main panel at the bottom of the primary display" msgstr "" -#: prefs.js:354 +#: prefs.js:490 msgid "Top (Default)" msgstr "" -#: prefs.js:362 +#: prefs.js:499 msgid "Main Panel Visibility" msgstr "" -#: prefs.js:363 -msgid "Main panel can be visible always, only in the overview or never." +#: prefs.js:500 +msgid "Allows to hide main panel when not needed" msgstr "" -#: prefs.js:368 +#: prefs.js:505 msgid "Always Visible (Default)" msgstr "" -#: prefs.js:369 +#: prefs.js:506 msgid "Overview Only" msgstr "" -#: prefs.js:370 +#: prefs.js:507 msgid "Always Hidden" msgstr "" -#: prefs.js:378 -msgid "Secondary Monitors" +#: prefs.js:517 +msgid "Workspace Switcher Popup" msgstr "" -#: prefs.js:384 -msgid "Workspace Thumbnails Position" +#: prefs.js:533 +#, javascript-format +msgid "Horizontal Position (% from left)" msgstr "" -#: prefs.js:385 +#: prefs.js:534 msgid "" -"Allows you to place workspace thumbnails of secondary monitors on the " -"opposite side than on the primary monitor." +"This popup shows up when you switch workspace using a keyboard shortcut or " +"gesture outside of the overview. You can disable it on the \"Behavior\" tab. " +"If you want more control over the popup, try the \"Workspace Switcher " +"Manager\" extension" msgstr "" -#: prefs.js:390 -msgid "Same as Primary" +#: prefs.js:554 +#, javascript-format +msgid "Vertical Position (% from top)" msgstr "" -#: prefs.js:391 -msgid "Left / Top" +#: prefs.js:565 +msgid "Notifications and OSD" msgstr "" -#: prefs.js:392 -msgid "Right / Bottom" +#: prefs.js:571 +msgid "Notification Banner Position" +msgstr "" + +#: prefs.js:572 +msgid "Choose where the notification banners appear on the screen" +msgstr "" + +#: prefs.js:577 prefs.js:597 prefs.js:1400 +msgid "Top Left" +msgstr "" + +#: prefs.js:578 +msgid "Top Center (Default)" +msgstr "" + +#: prefs.js:579 prefs.js:599 prefs.js:1401 +msgid "Top Right" +msgstr "" + +#: prefs.js:580 prefs.js:601 prefs.js:1402 +msgid "Bottom Left" +msgstr "" + +#: prefs.js:581 +msgid "Bottom Center" +msgstr "" + +#: prefs.js:582 prefs.js:603 prefs.js:1403 +msgid "Bottom Right" msgstr "" -#: prefs.js:410 -msgid "Adjusts secondary monitors workspace thumbnails vertical position." +#: prefs.js:590 +msgid "OSD Popup Position" msgstr "" -#: prefs.js:428 +#: prefs.js:591 msgid "" -"Adjusts maximum size of the workspace thumbnails (% relative to display " -"width) for secondary monitors." +"Choose where the OSD pop-ups (like sound volume level) appear on the screen" msgstr "" -#: prefs.js:445 -msgid "Workspace Preview Scale" +#: prefs.js:596 prefs.js:824 prefs.js:869 prefs.js:1334 prefs.js:1355 +#: prefs.js:1379 prefs.js:1513 prefs.js:1794 prefs.js:1812 prefs.js:1830 +#: prefs.js:1899 +msgid "Disable" msgstr "" -#: prefs.js:446 -msgid "Scales down workspace previews on secondary monitors." +#: prefs.js:598 +msgid "Top Center" msgstr "" -#: prefs.js:454 -msgid "Shift Workspace Preview by Panel Height" +#: prefs.js:600 +msgid "Center" +msgstr "" + +#: prefs.js:602 +msgid "Bottom Center (Default)" msgstr "" -#: prefs.js:455 +#: prefs.js:611 +msgid "Secondary Monitors" +msgstr "" + +#: prefs.js:617 +msgid "Workspace Thumbnails Position" +msgstr "" + +#: prefs.js:618 msgid "" -"This option can help align overview of the secondary monitor with the " -"primary monitor." +"Allows to place workspace thumbnails of secondary monitors on the opposite " +"side than on the primary monitor" msgstr "" -#: prefs.js:464 -msgid "Workspace Switcher Popup" +#: prefs.js:623 +msgid "Same as Primary" msgstr "" -#: prefs.js:480 -msgid "Horizontal Position (% from left)" +#: prefs.js:624 +msgid "Left / Top" +msgstr "" + +#: prefs.js:625 +msgid "Right / Bottom" +msgstr "" + +#: prefs.js:660 +msgid "Workspace Thumbnails Max Scale" msgstr "" -#: prefs.js:481 +#: prefs.js:661 msgid "" -"This popup shows up when you switch workspace using a keyboard shortcut or " -"gesture outside of the overview. You can disable it on the Behavior tab. If " -"you want more control over the popup, try Workspace Switcher Manager " -"extension." +"Adjusts maximum size of the workspace thumbnails (% relative to display " +"width / height) for secondary monitors" msgstr "" -#: prefs.js:499 -msgid "Vertical Position (% from top)" +#: prefs.js:678 +msgid "Workspace Preview Scale" +msgstr "" + +#: prefs.js:679 +msgid "Allows to scale down workspace previews on secondary monitors" msgstr "" -#: prefs.js:523 +#: prefs.js:687 +msgid "Shift Workspace Preview by Panel Height" +msgstr "" + +#: prefs.js:688 +msgid "" +"This option can help align overview of the secondary monitor with the " +"primary monitor" +msgstr "" + +#: prefs.js:713 msgid "Dash Max Icon Size" msgstr "" -#: prefs.js:524 -msgid "Maximum size of Dash icons in pixels. Works only with default Dash." +#: prefs.js:714 +msgid "Maximum size of Dash icons in pixels" msgstr "" -#: prefs.js:529 prefs.js:732 prefs.js:752 prefs.js:853 +#: prefs.js:719 prefs.js:958 prefs.js:979 prefs.js:1109 msgid "128" msgstr "" -#: prefs.js:530 prefs.js:733 prefs.js:753 prefs.js:854 +#: prefs.js:720 prefs.js:959 prefs.js:980 prefs.js:1110 msgid "112" msgstr "" -#: prefs.js:531 prefs.js:734 prefs.js:754 prefs.js:855 +#: prefs.js:721 prefs.js:960 prefs.js:981 msgid "96" msgstr "" -#: prefs.js:532 prefs.js:735 prefs.js:755 prefs.js:856 +#: prefs.js:722 prefs.js:961 prefs.js:982 prefs.js:1112 msgid "80" msgstr "" -#: prefs.js:533 prefs.js:676 prefs.js:736 prefs.js:756 prefs.js:857 +#: prefs.js:723 prefs.js:962 prefs.js:983 prefs.js:1113 msgid "64" msgstr "" -#: prefs.js:534 prefs.js:677 prefs.js:737 prefs.js:757 prefs.js:858 +#: prefs.js:724 prefs.js:866 prefs.js:963 prefs.js:984 prefs.js:1114 msgid "48" msgstr "" -#: prefs.js:535 prefs.js:678 prefs.js:758 prefs.js:859 +#: prefs.js:725 prefs.js:867 prefs.js:985 prefs.js:1115 msgid "32" msgstr "" -#: prefs.js:536 -msgid "24" +#: prefs.js:733 +msgid "Dash Background Style" msgstr "" -#: prefs.js:537 -msgid "16" +#: prefs.js:734 +msgid "" +"Allows you to change the background color of the dash to match the search " +"results an app folders" msgstr "" -#: prefs.js:551 -msgid "Show Apps Icon Position" +#: prefs.js:739 prefs.js:1283 prefs.js:1313 prefs.js:1399 prefs.js:1475 +#: prefs.js:1491 prefs.js:1793 prefs.js:1811 prefs.js:1869 prefs.js:1884 +msgid "Default" msgstr "" -#: prefs.js:552 -msgid "Sets the position of the \"Show Applications\" icon in the Dash." +#: prefs.js:740 +msgid "Light" msgstr "" -#: prefs.js:558 prefs.js:573 prefs.js:588 -msgid "Start" +#: prefs.js:756 +msgid "Dash Background Opacity" msgstr "" -#: prefs.js:559 prefs.js:574 prefs.js:589 -msgid "End" +#: prefs.js:757 +msgid "Adjusts the opacity of the Dash background" msgstr "" -#: prefs.js:566 -msgid "Open Windows Icon Position" +#: prefs.js:775 +msgid "Dash Background Radius" msgstr "" -#: prefs.js:567 +#: prefs.js:776 msgid "" -"This option adds \"Search Open Windows\" icon into dash (if window search " -"provider enabled on the Behavior tab) so you can directly toggle window " -"search provider results. Even if you disable this icon, you can use the " -"secondary mouse button click on the Show Apps Icon, or the Space hotkey to " -"access this feature." +"Adjusts the border radius of the Dash background in pixels. 0 means the " +"default value given by the current theme style" msgstr "" -#: prefs.js:581 -msgid "Recent Files Icon Position" +#: prefs.js:786 +msgid "Dash Background GNOME 3 Style" msgstr "" -#: prefs.js:582 +#: prefs.js:787 msgid "" -"This option adds \"Search Recent Files\" icon into dash (if recent files " -"search provider enabled on the Behavior tab) so you can directly toggle " -"recent files search provider results. Even if you disable this icon, you can " -"use Ctrl + Space hotkey to access this feature." +"Background of the vertically oriented dash will imitate the GNOME 3 style" msgstr "" -#: prefs.js:597 -msgid "Dash Background Opacity" +#: prefs.js:797 +msgid "Running App Indicator" msgstr "" -#: prefs.js:598 -msgid "Adjusts the opacity of the dash background." +#: prefs.js:798 +msgid "" +"Allows you to change style of the running app indicator under the app icon" msgstr "" -#: prefs.js:614 -msgid "Dash Background Radius" +#: prefs.js:803 +msgid "Dot (Default)" msgstr "" -#: prefs.js:615 -msgid "" -"Adjusts the border radius of the dash background in pixels. 0 means default " -"value." +#: prefs.js:804 +msgid "Line" msgstr "" -#: prefs.js:623 prefs.js:1050 +#: prefs.js:812 prefs.js:1501 msgid "Workspace Thumbnails" msgstr "" -#: prefs.js:629 +#: prefs.js:818 msgid "Show Workspace Thumbnail Labels" msgstr "" -#: prefs.js:630 +#: prefs.js:819 msgid "" -"Each workspace thumbnail can show its index and name (if defined in the " -"system settings) or name/title of its most recently used app/window." -msgstr "" - -#: prefs.js:635 prefs.js:680 prefs.js:1001 prefs.js:1062 prefs.js:1260 -#: prefs.js:1278 prefs.js:1296 prefs.js:1331 -msgid "Disable" +"Each workspace thumbnail can show label with its index and name (if defined " +"in the system settings) or name/title of its most recently used app/window" msgstr "" -#: prefs.js:636 +#: prefs.js:825 msgid "Index" msgstr "" -#: prefs.js:637 +#: prefs.js:826 msgid "Index + WS Name" msgstr "" -#: prefs.js:638 +#: prefs.js:827 msgid "Index + App Name" msgstr "" -#: prefs.js:639 +#: prefs.js:828 msgid "Index + Window Title" msgstr "" -#: prefs.js:646 +#: prefs.js:835 msgid "Show WS Thumbnail Label on Hover" msgstr "" -#: prefs.js:647 -msgid "Show label only when the mouse pointer hovers over a thumbnail" +#: prefs.js:836 +msgid "Show the label only when the mouse pointer hovers over the thumbnail" msgstr "" -#: prefs.js:655 +#: prefs.js:844 msgid "Show Wallpaper in Workspace Thumbnails" msgstr "" -#: prefs.js:656 -msgid "All workspace thumbnails will include the current desktop background." +#: prefs.js:845 +msgid "All workspace thumbnails will include the current desktop background" msgstr "" -#: prefs.js:664 +#: prefs.js:853 prefs.js:1523 msgid "Window Preview" msgstr "" -#: prefs.js:670 +#: prefs.js:859 msgid "Window Preview App Icon Size" msgstr "" -#: prefs.js:671 -msgid "Default size is 64." +#: prefs.js:865 +msgid "64 (Default)" msgstr "" -#: prefs.js:679 +#: prefs.js:868 msgid "22" msgstr "" -#: prefs.js:687 -msgid "Always Show Window Titles" +#: prefs.js:877 +msgid "Window Title Position / Visibility" msgstr "" -#: prefs.js:688 +#: prefs.js:878 msgid "" -"All windows on the workspace preview will show their titles, not only the " -"one with the mouse pointer." +"Sets the position of the window title that is displayed when the mouse " +"hovers over the window or can always be visible" msgstr "" -#: prefs.js:703 +#: prefs.js:883 +msgid "Inside Window" +msgstr "" + +#: prefs.js:884 +msgid "Inside Window Always Visible" +msgstr "" + +#: prefs.js:885 +msgid "Below Window (Default)" +msgstr "" + +#: prefs.js:893 +msgid "Show Close Window Button" +msgstr "" + +#: prefs.js:894 +msgid "Allows you to hide close window button" +msgstr "" + +#: prefs.js:911 msgid "Show Workspace Preview Background" msgstr "" -#: prefs.js:704 -msgid "Allows you to hide the scaling background of the workspace preview." +#: prefs.js:912 +msgid "Allows to hide the background of the workspace preview" msgstr "" -#: prefs.js:718 +#: prefs.js:929 +msgid "Workspace Background Corner Radius" +msgstr "" + +#: prefs.js:930 +msgid "Adjusts the corner radius of the workspace preview in the overview" +msgstr "" + +#: prefs.js:944 msgid "Icon Size" msgstr "" -#: prefs.js:719 +#: prefs.js:945 msgid "" -"Allows to force fixed icon size and bypass the default adaptive algorithm." +"Allows to set a fixed app grid icon size and bypass the default adaptive " +"algorithm" msgstr "" -#: prefs.js:724 prefs.js:751 +#: prefs.js:950 prefs.js:978 msgid "Adaptive (Default)" msgstr "" -#: prefs.js:725 +#: prefs.js:951 msgid "256" msgstr "" -#: prefs.js:726 +#: prefs.js:952 msgid "224" msgstr "" -#: prefs.js:727 +#: prefs.js:953 msgid "208" msgstr "" -#: prefs.js:728 +#: prefs.js:954 msgid "192" msgstr "" -#: prefs.js:729 +#: prefs.js:955 msgid "176" msgstr "" -#: prefs.js:730 +#: prefs.js:956 msgid "160" msgstr "" -#: prefs.js:731 +#: prefs.js:957 msgid "144" msgstr "" -#: prefs.js:745 +#: prefs.js:972 msgid "Folder Icon Size" msgstr "" -#: prefs.js:746 +#: prefs.js:973 msgid "" -"Allows to disable the default adaptive algorithm and set a fixed size of " -"icons inside folders." +"Allows to set a fixed icon size and bypass the default adaptive algorithm in " +"the open folder dialog" msgstr "" -#: prefs.js:766 +#: prefs.js:994 msgid "Max App Folder Icon Grid Size" msgstr "" -#: prefs.js:767 +#: prefs.js:995 msgid "" -"Each folder icon shows (up to) 4 app icons as a preview of the folder " -"content, this option allows you to increase the number to 9 icons if folder " -"contains more than 4 or 8 apps. The latter avoids half empty folder icons." +"Sets a grid size (number of icons) in the folder preview. 3x3 options " +"automatically switches between 2x2 and 3x3 grid depending on the number of " +"icons in the folder" msgstr "" -#: prefs.js:772 +#: prefs.js:999 msgid "2x2 (Default)" msgstr "" -#: prefs.js:773 +#: prefs.js:1000 msgid "3x3 for 5+ apps" msgstr "" -#: prefs.js:774 +#: prefs.js:1001 msgid "3x3 for 9+ apps" msgstr "" -#: prefs.js:788 +#: prefs.js:1016 msgid "Columns per Page (0 for adaptive grid)" msgstr "" -#: prefs.js:789 +#: prefs.js:1017 msgid "" -"Number of columns in application grid. If set to 0 (default setting) the " -"number will be set automatically to fit available height." +"Number of columns in the application grid. If set to 0 (the default), the " +"number will be set automatically to fit the available width" msgstr "" -#: prefs.js:803 +#: prefs.js:1033 msgid "Rows per Page (0 for adaptive grid)" msgstr "" -#: prefs.js:804 +#: prefs.js:1034 msgid "" -"Number of rows in application grid. If set to 0 (default setting) the number " -"will be set automatically to fit available height." +"Number of rows in the application grid. If set to 0 (the default), the " +"number will be set automatically to fit the available height" msgstr "" -#: prefs.js:818 +#: prefs.js:1050 msgid "Folder Columns per Page (0 for adaptive grid)" msgstr "" -#: prefs.js:819 +#: prefs.js:1051 msgid "" -"Number of columns in folder grid. If you leave the value on 0, the number of " -"columns will be calculated to fit all folder icons." +"Number of columns in folder grid. If you leave the value at 0, the number of " +"columns will be calculated to fit all the folder icons on one page" msgstr "" -#: prefs.js:833 +#: prefs.js:1067 msgid "Folder Rows per Page (0 for adaptive grid)" msgstr "" -#: prefs.js:834 +#: prefs.js:1068 msgid "" -"Number of rows in folder grid. If you leave the value on 0, the number of " -"rows will be calculated to fit all folder icons." +"Number of rows in folder grid. If you leave the value at 0, the number of " +"rows will be calculated to fit all the folder icons on one page" msgstr "" -#: prefs.js:841 prefs.js:1174 prefs.js:1492 +#: prefs.js:1086 +msgid "Grid Spacing" +msgstr "" + +#: prefs.js:1087 +msgid "" +"Adjusts the spacing between icons in a grid, the real impact is on folders" +msgstr "" + +#: prefs.js:1097 prefs.js:1715 prefs.js:2058 msgid "Search" msgstr "" -#: prefs.js:847 +#: prefs.js:1103 msgid "App Search Icon Size" msgstr "" -#: prefs.js:848 -msgid "Size of results provided by the App Search Provider." +#: prefs.js:1104 +msgid "" +"Size of results provided by the App Search Provider - smaller size allows to " +"fit more results" +msgstr "" + +#: prefs.js:1111 +msgid "96 (Default)" msgstr "" -#: prefs.js:878 +#: prefs.js:1135 msgid "Max Search Results Rows" msgstr "" -#: prefs.js:879 +#: prefs.js:1136 msgid "" "Sets the maximum number of rows for result lists of all search providers " -"except window search provider which always lists all results." +"except the window search provider which always lists all results" msgstr "" -#: prefs.js:888 +#: prefs.js:1147 msgid "Overview Background" msgstr "" -#: prefs.js:894 -msgid "Show Static Background" +#: prefs.js:1153 +msgid "Show Wallpaper" msgstr "" -#: prefs.js:895 -msgid "Show static background wallpaper instead of the solid grey color." +#: prefs.js:1154 +msgid "" +"Replaces the solid grey background in the overview with the current desktop " +"wallpaper" msgstr "" -#: prefs.js:911 +#: prefs.js:1170 +msgid "Brightness" +msgstr "" + +#: prefs.js:1171 +msgid "Brightness of the background wallpaper in the overview" +msgstr "" + +#: prefs.js:1187 +msgid "Brightness for Search View" +msgstr "" + +#: prefs.js:1188 +msgid "" +"Allows you to set a lower background brightness for search view mode where " +"text visibility is more important" +msgstr "" + +#: prefs.js:1204 msgid "Blur Window Picker Background" msgstr "" -#: prefs.js:912 -msgid "Blur background wallpaper (if enabled) in the window picker view." +#: prefs.js:1205 +msgid "Sets the amount of background blur in the window picker view" msgstr "" -#: prefs.js:928 +#: prefs.js:1221 msgid "Blur App Grid/Search View Background" msgstr "" -#: prefs.js:929 +#: prefs.js:1222 msgid "" -"Blur background wallpaper (if enabled) in the app grid and search results " -"views." +"Sets the amount of background blur in the app grid and search results views" msgstr "" -#: prefs.js:937 +#: prefs.js:1230 msgid "Smooth Blur Transitions" msgstr "" -#: prefs.js:938 +#: prefs.js:1231 msgid "" -"Makes blur transitions smoother but can impact overall smoothness of " -"overview animations." +"Allows for smoother blur transitions, but can affect the overall smoothness " +"of overview animations on weak hardware" msgstr "" -#: prefs.js:953 prefs.js:980 prefs.js:1002 -msgid "Overview" +#: prefs.js:1240 +msgid "Window Thumbnails (PIP)" msgstr "" -#: prefs.js:959 -msgid "Overview Mode" +#: prefs.js:1255 +#, javascript-format +msgid "Default Window Thumbnail (PIP) Scale (% of screen height)" msgstr "" -#: prefs.js:960 +#: prefs.js:1256 msgid "" -"The Expose Windows on Hover mode do not expose the workspace preview windows " -"until the mouse pointer enters any window.\n" -"The Static Workspace mode does not scale the workspace preview, it only " -"shows Dash and workspace thumbnails over the desktop. Clicking on a " -"workspace thumbnail scales the ws preview and exposes its windows like in " -"the default overview mode." +"Default scale of window thumbnail (like Picture In Picture) that you can " +"create using the app icon menu or window preview action" msgstr "" -#: prefs.js:965 prefs.js:1259 prefs.js:1277 prefs.js:1317 -msgid "Default" +#: prefs.js:1271 +msgid "Overview" +msgstr "" + +#: prefs.js:1277 +msgid "Overview Mode" +msgstr "" + +#: prefs.js:1278 +msgid "" +"The Expose Windows on Hover mode does not expose the workspace preview " +"windows until the mouse pointer enters any window\n" +"The Static Workspace mode keeps the workspace static when you activate the " +"overview, it only shows Dash, workspace thumbnails and search entry over the " +"workspace and only clicking on an active workspace thumbnail activates the " +"default overview" msgstr "" -#: prefs.js:966 +#: prefs.js:1284 msgid "Expose Windows on Hover" msgstr "" -#: prefs.js:967 +#: prefs.js:1285 msgid "Static Workspace" msgstr "" -#: prefs.js:974 +#: prefs.js:1292 msgid "Startup State" msgstr "" -#: prefs.js:975 -msgid "Allows to change the state in which GNOME Shell starts a session." +#: prefs.js:1293 +msgid "Allows to change the state in which GNOME Shell starts a session" +msgstr "" + +#: prefs.js:1298 prefs.js:1336 +msgid "Overview (Default)" msgstr "" -#: prefs.js:981 +#: prefs.js:1299 msgid "Desktop" msgstr "" -#: prefs.js:982 prefs.js:1003 +#: prefs.js:1300 prefs.js:1337 prefs.js:1382 msgid "Applications" msgstr "" -#: prefs.js:989 +#: prefs.js:1307 +msgid "Escape Key Behavior" +msgstr "" + +#: prefs.js:1308 msgid "" -"Hot Corner (Install Custom Hot Corners - Extended extension for more options)" +"Allows you to close the overview with a single press of the Escape key, even " +"from the application grid or from search, if the search entry field does not " +"have focus" msgstr "" -#: prefs.js:995 -msgid "Hot corner Action" +#: prefs.js:1314 +msgid "Close Overview" +msgstr "" + +#: prefs.js:1322 +msgid "Overlay Key (Super/Windows)" msgstr "" -#: prefs.js:996 +#: prefs.js:1328 +msgid "Single-Press Action" +msgstr "" + +#: prefs.js:1329 msgid "" -"Disable or change behavior of hot corner. Holding down the Ctrl key while " -"hitting the hot corner switches between Overview/Applications actions." +"Disable or change behavior when you press and release the Super key. The " +"\"Search Windows\" options requires the WindowSearchProvider module to be " +"activated" +msgstr "" + +#: prefs.js:1335 prefs.js:1380 +msgid "Follow Global Overview Mode" +msgstr "" + +#: prefs.js:1338 prefs.js:1383 +msgid "Overview - Static WS Preview" +msgstr "" + +#: prefs.js:1339 prefs.js:1384 +msgid "Overview - Static Workspace" msgstr "" -#: prefs.js:1010 -msgid "Enable Hot Corner in Full-Screen mode" +#: prefs.js:1340 prefs.js:1357 prefs.js:1385 +msgid "Search Windows" msgstr "" -#: prefs.js:1011 +#: prefs.js:1349 +msgid "Double-Press Action" +msgstr "" + +#: prefs.js:1350 +msgid "" +"Disable or change behavior when you double-press the Super key. The \"Search " +"Windows\" option requires the WindowSearchProvider module to be activated. " +"The \"Static WS Overview - Expose Windows\" option allows you to switch to " +"default Activities Overview window picker view if you set static workspace " +"(preview) for the single press/release Super key action" +msgstr "" + +#: prefs.js:1356 +msgid "Applications (Default)" +msgstr "" + +#: prefs.js:1358 prefs.js:1381 +msgid "Overview - Window Picker" +msgstr "" + +#: prefs.js:1367 +msgid "Hot Corner (Install Custom Hot Corners - Extended for more options)" +msgstr "" + +#: prefs.js:1373 +msgid "Hot Corner Action" +msgstr "" + +#: prefs.js:1374 +msgid "" +"Disable or change behavior of the hot corner. Holding down the Ctrl key " +"while hitting the hot corner switches between Overview/Applications actions" +msgstr "" + +#: prefs.js:1393 +msgid "Hot Corner Position" +msgstr "" + +#: prefs.js:1394 +msgid "" +"Choose which corner of your monitors will be active. If you choose \"Follow " +"Dash\" option, the corner will be placed near the left or top edge of the " +"Dash. The last option extends the hot corner trigger to cover the entire ege " +"of the monitor where Dash is located" +msgstr "" + +#: prefs.js:1404 +msgid "Follow Dash" +msgstr "" + +#: prefs.js:1405 +msgid "Follow Dash - Hot Edge" +msgstr "" + +#: prefs.js:1413 +msgid "Enable Hot Corner in Full-Screen Mode" +msgstr "" + +#: prefs.js:1414 msgid "" "If you often work with full-screen applications and want the hot corner to " -"be usable." +"be usable" msgstr "" -#: prefs.js:1020 +#: prefs.js:1424 msgid "Show Ripples Animation" msgstr "" -#: prefs.js:1021 -msgid "Ripples animation shows up when you trigger hot corner." +#: prefs.js:1425 +msgid "" +"The ripple animation is played when the hot corner is activated. The ripple " +"size has been reduced to be less distracting" +msgstr "" + +#: prefs.js:1441 +msgid "Isolate Workspaces" +msgstr "" + +#: prefs.js:1442 +msgid "Dash will only show apps and windows from the current workspace" +msgstr "" + +#: prefs.js:1452 +msgid "App Icon - Click Behavior" +msgstr "" + +#: prefs.js:1453 +msgid "" +"Choose your preferred behavior when clicking on an app icon. The \"Prefer " +"Current Workspace\" option opens a new app window if not present in the " +"current workspace. The \"Open New Window\" option also switches behavior of " +"the middle click to \"Activate\" since its default behavior is to open a new " +"window" +msgstr "" + +#: prefs.js:1458 +msgid "Activate App Immediately" +msgstr "" + +#: prefs.js:1459 +msgid "First Switch to Workspace" +msgstr "" + +#: prefs.js:1460 +msgid "Open New Window (if supported)" +msgstr "" + +#: prefs.js:1461 +msgid "Prefer Current Workspace" +msgstr "" + +#: prefs.js:1469 +msgid "App Icon - Scroll Action" msgstr "" -#: prefs.js:1036 -msgid "Dash Icon Click" +#: prefs.js:1470 +msgid "" +"Choose the behavior when scrolling over an app icon. The window cycler works " +"with a list of windows sorted by the \"Most Recently Used\" and grouped by " +"workspaces. Scrolling up cycles through previously used windows on the same " +"workspace and then switches to another workspace, if any" +msgstr "" + +#: prefs.js:1476 +msgid "Cycle App Windows - Highlight Selected" +msgstr "" + +#: prefs.js:1477 +msgid "Cycle App Windows - Highlight App" msgstr "" -#: prefs.js:1037 +#: prefs.js:1485 +msgid "Search Windows Icon - Scroll Action" +msgstr "" + +#: prefs.js:1486 msgid "" -"if the app you clicked on has more than one window and the recently used " -"window is not on the current workspace, the overview can switch to the " -"workspace with the recent window." +"Choose the behavior when scrolling over the Search Windows icon. The window " +"cycler works with a list of windows sorted by \"Most Recently Used\" of the " +"current workspace or all workspaces. Scrolling up cycles through previously " +"used windows on the same workspace, or all windows regardless workspace. " +"This option is mainly useful for the static workspace overview mode." msgstr "" -#: prefs.js:1042 -msgid "Activate Last Used Window Immediately" +#: prefs.js:1492 +msgid "Cycle All Windows" msgstr "" -#: prefs.js:1043 -msgid "Switch to Workspace with Recently Used Window" +#: prefs.js:1493 +msgid "Cycle Windows On Current WS" msgstr "" -#: prefs.js:1056 +#: prefs.js:1507 msgid "Close Workspace Button" msgstr "" -#: prefs.js:1057 +#: prefs.js:1508 msgid "" "The Close Workspace button appears on the workspace thumbnail when you hover " "over it and allows you to close all windows on the workspace. You can choose " -"a safety lock to prevent accidental use." +"a \"safety lock\" to prevent accidental use" msgstr "" -#: prefs.js:1063 +#: prefs.js:1514 msgid "Single Click" msgstr "" -#: prefs.js:1064 +#: prefs.js:1515 msgid "Double Click" msgstr "" -#: prefs.js:1065 +#: prefs.js:1516 msgid "Ctrl Key + Click" msgstr "" -#: prefs.js:1078 -msgid "Apps Order" +#: prefs.js:1529 +msgid "Secondary Button Click Action" +msgstr "" + +#: prefs.js:1530 +msgid "Allows you to add a secondary mouse click action to the window preview" +msgstr "" + +#: prefs.js:1535 prefs.js:1552 prefs.js:1569 +msgid "Activate Window (Default)" +msgstr "" + +#: prefs.js:1536 prefs.js:1553 +msgid "Close Window" +msgstr "" + +#: prefs.js:1537 prefs.js:1554 prefs.js:1570 +msgid "Search For Same App Windows" +msgstr "" + +#: prefs.js:1538 prefs.js:1555 prefs.js:1571 lib/dash.js:1315 +msgid "Create Window Thumbnail - PIP" +msgstr "" + +#: prefs.js:1546 +msgid "Middle Button Click Action" +msgstr "" + +#: prefs.js:1547 +msgid "Allows you to add a middle mouse click action to the window preview" +msgstr "" + +#: prefs.js:1563 +msgid "App Icon Click Action" +msgstr "" + +#: prefs.js:1564 +msgid "" +"Select the action to take when the application icon on the window preview is " +"clicked" +msgstr "" + +#: prefs.js:1579 +msgid "Always Activate Selected" +msgstr "" + +#: prefs.js:1580 +msgid "" +"If enabled, the currently selected window will be activated when leaving the " +"Overview even without clicking. Usage example - press Super to open the " +"Overview, place mouse pointer over a window, press Super again to activate " +"the window" msgstr "" -#: prefs.js:1079 +#: prefs.js:1596 +msgid "App Grid Order" +msgstr "" + +#: prefs.js:1597 msgid "" -"Choose sorting method for the app grid. Note that sorting by alphabet and " -"usage ignores folders." +"Choose sorting method for the app grid. Note that sorting by usage ignores " +"folders" msgstr "" -#: prefs.js:1084 +#: prefs.js:1602 prefs.js:1619 msgid "Custom (Default)" msgstr "" -#: prefs.js:1085 +#: prefs.js:1603 +msgid "Alphabet - Folders First" +msgstr "" + +#: prefs.js:1604 +msgid "Alphabet - Folders Last" +msgstr "" + +#: prefs.js:1605 +msgid "Usage - No Folders" +msgstr "" + +#: prefs.js:1613 +msgid "App Folder Order" +msgstr "" + +#: prefs.js:1614 +msgid "Choose sorting method for app folders" +msgstr "" + +#: prefs.js:1620 msgid "Alphabet" msgstr "" -#: prefs.js:1086 +#: prefs.js:1621 msgid "Usage" msgstr "" -#: prefs.js:1093 +#: prefs.js:1629 msgid "App Grid Content" msgstr "" -#: prefs.js:1094 +#: prefs.js:1630 msgid "" -"The default Shell removes favorite apps, this option lets you duplicate them " -"in the grid or remove also running applications. Option \"Favorites and " -"Running First\" only works with the Alphabet and Usage sorting." +"The default Shell removes favorite apps, this option allows to duplicate " +"them in the grid or remove also running applications. Option \"Favorites and " +"Running First\" only works with the Alphabet and Usage sorting" msgstr "" -#: prefs.js:1099 +#: prefs.js:1635 msgid "Include All" msgstr "" -#: prefs.js:1100 +#: prefs.js:1636 msgid "Include All - Favorites and Running First" msgstr "" -#: prefs.js:1101 +#: prefs.js:1637 msgid "Exclude Favorites (Default)" msgstr "" -#: prefs.js:1102 +#: prefs.js:1638 msgid "Exclude Running" msgstr "" -#: prefs.js:1103 +#: prefs.js:1639 msgid "Exclude Favorites and Running" msgstr "" -#: prefs.js:1110 +#: prefs.js:1647 msgid "Active Icons in Folder Preview" msgstr "" -#: prefs.js:1111 +#: prefs.js:1648 msgid "" -"If enabled, clicking an app icon in a folder preview directly opens the app " -"without having to open the folder first. Middle button opens new window of " -"the app without closing the overview, so you can open multiple apps in a row " -"on the current workspace and secondary button opens the folder." +"If enabled, icons in the folder review behaves like normal icons, you can " +"activate or even drag them directly, without having to open the folder first" msgstr "" -#: prefs.js:1120 +#: prefs.js:1658 msgid "Center Open Folders" msgstr "" -#: prefs.js:1121 +#: prefs.js:1659 msgid "" "App folder may open in the center of the screen or above the source folder " -"icon." +"icon" msgstr "" -#: prefs.js:1130 +#: prefs.js:1669 msgid "Allow Incomplete Pages" msgstr "" -#: prefs.js:1131 +#: prefs.js:1670 msgid "" "If disabled, icons from the next page (if any) are automatically moved to " "fill any empty slot left after an icon was (re)moved (to a folder for " -"example)." +"example)" msgstr "" -#: prefs.js:1140 +#: prefs.js:1680 msgid "App Labels Behavior" msgstr "" -#: prefs.js:1141 -msgid "Choose how and when to display app names." +#: prefs.js:1681 +msgid "Choose how and when to display app names" msgstr "" -#: prefs.js:1146 +#: prefs.js:1686 msgid "Ellipsized - Expand Selected (Default)" msgstr "" -#: prefs.js:1147 +#: prefs.js:1687 msgid "Always Expanded" msgstr "" -#: prefs.js:1148 +#: prefs.js:1688 msgid "Hidden - Show Selected Only" msgstr "" -#: prefs.js:1154 +#: prefs.js:1695 msgid "Reset App Grid Layout" msgstr "" -#: prefs.js:1155 +#: prefs.js:1696 msgid "" -"Removes all stored app grid icons positions, after the reset icons will be " -"ordered alphabetically." +"Removes all stored app grid positions, after reset icons will be sorted " +"alphabetically, except folder contents" msgstr "" -#: prefs.js:1163 +#: prefs.js:1704 msgid "Remove App Grid Folders" msgstr "" -#: prefs.js:1164 -msgid "Removes all folders, folder apps move to root grid." +#: prefs.js:1705 +msgid "Removes all folders, folder apps will move to the root grid" msgstr "" -#: prefs.js:1186 -msgid "Enable Window Search Provider" +#: prefs.js:1721 +msgid "Window Search Provider - Sorting" msgstr "" -#: prefs.js:1187 -msgid "" -"Activates the window search provider that adds open windows to the search " -"results. You can search app names and window titles. You can also use \"wq/" -"\" prefix to suppress results from other search providers." +#: prefs.js:1722 +msgid "Choose the window sorting method" msgstr "" -#: prefs.js:1195 -msgid "Enable Recent Files Search Provider" +#: prefs.js:1727 +msgid "Most Recently Used (MRU)" msgstr "" -#: prefs.js:1196 -msgid "" -"Activates the recent files search provider that can be triggered by a dash " -"icon, Ctrl + Space hotkey or by typing \"fq//\" prefix in the search entry " -"field. This option needs File History option enabled in the GNOME Privacy " -"settings." +#: prefs.js:1728 +msgid "MRU - Current Workspace First" msgstr "" -#: prefs.js:1204 +#: prefs.js:1729 +msgid "MRU - By Workspaces" +msgstr "" + +#: prefs.js:1730 +msgid "Stable Sequence - By Workspaces" +msgstr "" + +#: prefs.js:1738 msgid "Enable Fuzzy Match" msgstr "" -#: prefs.js:1205 +#: prefs.js:1739 msgid "" "Enabling the fuzzy match allows you to skip letters in the pattern you are " "searching for and find \"Firefox\" even if you type \"ffx\". Works only for " -"the App, Window and Recent files search providers." +"the App, Window and Recent files search providers" msgstr "" -#: prefs.js:1223 +#: prefs.js:1757 msgid "Animations - General" msgstr "" -#: prefs.js:1238 +#: prefs.js:1772 msgid "Animation Speed" msgstr "" -#: prefs.js:1239 +#: prefs.js:1773 +#, javascript-format msgid "" "Adjusts the global animation speed in % of the default duration - higher " -"value means slower animation." +"value means slower animation" msgstr "" -#: prefs.js:1247 +#: prefs.js:1781 msgid "Animations - Overview" msgstr "" -#: prefs.js:1253 +#: prefs.js:1787 msgid "App Grid Animation" msgstr "" -#: prefs.js:1254 +#: prefs.js:1788 msgid "" "When entering the App Grid view, the app grid animates from the edge of the " -"screen. You can choose direction, keep it Default (direction will be chosen " -"automatically) or disable the animation if you don't like it." +"screen. You can choose the direction, keep the Default (direction will be " +"selected automatically) or disable the animation if you don't like it" msgstr "" -#: prefs.js:1261 prefs.js:1279 +#: prefs.js:1795 prefs.js:1813 msgid "Right to Left" msgstr "" -#: prefs.js:1262 prefs.js:1280 +#: prefs.js:1796 prefs.js:1814 msgid "Left to Right" msgstr "" -#: prefs.js:1263 prefs.js:1281 +#: prefs.js:1797 prefs.js:1815 msgid "Bottom to Top" msgstr "" -#: prefs.js:1264 prefs.js:1282 +#: prefs.js:1798 prefs.js:1816 msgid "Top to Bottom" msgstr "" -#: prefs.js:1271 +#: prefs.js:1805 msgid "Search View Animation" msgstr "" -#: prefs.js:1272 +#: prefs.js:1806 msgid "" "When search is activated the search view with search results can animate " -"from the edge of the screen. You can choose direction, keep it Default " +"from the edge of the screen. You can choose the direction, keep the Default " "(currently Bottom to Top) or disable the animation if you don't like it." msgstr "" -#: prefs.js:1290 +#: prefs.js:1824 msgid "Workspace Preview Animation" msgstr "" -#: prefs.js:1291 +#: prefs.js:1825 msgid "" "When entering / leaving the App Grid / Search view, the workspace preview " "can animate to/from workspace thumbnail." msgstr "" -#: prefs.js:1297 +#: prefs.js:1831 msgid "Enable" msgstr "" -#: prefs.js:1305 +#: prefs.js:1839 msgid "Workspace Switcher" msgstr "" -#: prefs.js:1311 -msgid "Workspace Switcher Animation" +#: prefs.js:1845 +msgid "Wraparound" msgstr "" -#: prefs.js:1312 -msgid "" -"Allows you to disable movement of the desktop background during workspace " -"switcher animation outside of the overview. The Static Background mode also " -"keeps Conky and desktop icons on their place during switching." -msgstr "" - -#: prefs.js:1318 -msgid "Static Background" +#: prefs.js:1846 +msgid "Continue from the last workspace to the first and vice versa" msgstr "" -#: prefs.js:1325 -msgid "Workspace Switcher Popup Mode" +#: prefs.js:1854 +msgid "Ignore Last (empty) Workspace" msgstr "" -#: prefs.js:1326 +#: prefs.js:1855 msgid "" -"This popup shows up when you switch workspace using a keyboard shortcut or " -"gesture outside of the overview. You can to disable the popup at all, or " -"show it on the current monitor (the one with mouse pointer) instead of the " -"primary." +"In Dynamic workspaces mode, there is always one empty workspace at the end. " +"Switcher can ignore this last workspace" msgstr "" -#: prefs.js:1332 -msgid "Show on Primary Monitor (Default)" +#: prefs.js:1863 +msgid "Workspace Switcher Animation" msgstr "" -#: prefs.js:1333 -msgid "Show on Current Monitor" +#: prefs.js:1864 +msgid "" +"Allows you to disable movement of the desktop background during workspace " +"switcher animation outside of the overview. The Static Background mode also " +"keeps Conky and desktop icons on their place during switching." msgstr "" -#: prefs.js:1341 -msgid "Notifications" +#: prefs.js:1870 +msgid "Static Background" msgstr "" -#: prefs.js:1347 -msgid "Notification Banner Position" +#: prefs.js:1878 +msgid "Workspace Switcher Mode (Isolate Monitors)" msgstr "" -#: prefs.js:1348 -msgid "Choose where the notification pop-ups appear on the screen." +#: prefs.js:1879 +msgid "" +"Note that this is a workaround, not full-fledged feature. GNOME Shell does " +"not support separate workspaces for each monitor, so V-Shell switches " +"workspaces only on the primary monitor and moves windows across workspaces " +"on secondary monitors in order to simulate independent behavior. The current " +"monitor is determined by the position of the mouse pointer" msgstr "" -#: prefs.js:1353 -msgid "Top Left" +#: prefs.js:1885 +msgid "Current Monitor" msgstr "" -#: prefs.js:1354 -msgid "Top Middle" +#: prefs.js:1893 +msgid "Workspace Switcher Popup Mode" msgstr "" -#: prefs.js:1355 -msgid "Top Right (Default)" +#: prefs.js:1894 +msgid "" +"This popup shows up when you switch workspace using a keyboard shortcut or " +"gesture outside of the overview. You can to disable the popup at all, or " +"show it on the current monitor (the one with mouse pointer) instead of the " +"primary." msgstr "" -#: prefs.js:1356 -msgid "Bottom Left" +#: prefs.js:1900 +msgid "Show on Primary Monitor (Default)" msgstr "" -#: prefs.js:1357 -msgid "Bottom Middle" +#: prefs.js:1901 +msgid "Show on Current Monitor" msgstr "" -#: prefs.js:1358 -msgid "Bottom Right" +#: prefs.js:1909 +msgid "Notifications" msgstr "" -#: prefs.js:1365 +#: prefs.js:1915 msgid "Window Attention Handler" msgstr "" -#: prefs.js:1366 +#: prefs.js:1916 msgid "" "When a window requires attention (often a new window), GNOME Shell shows you " "a notification about it. You can disable popups of these messages " "(notification will be pushed into the message tray silently) or focus the " -"source window immediately instead." +"source window immediately instead" msgstr "" -#: prefs.js:1371 prefs.js:1386 +#: prefs.js:1921 prefs.js:1937 msgid "Show Notifications (Default)" msgstr "" -#: prefs.js:1372 +#: prefs.js:1922 msgid "Disable Notification Popups" msgstr "" -#: prefs.js:1373 +#: prefs.js:1923 msgid "Immediately Focus Window" msgstr "" -#: prefs.js:1380 +#: prefs.js:1931 msgid "Favorites" msgstr "" -#: prefs.js:1381 -msgid "Disable pin/unpin app notifications." +#: prefs.js:1932 +msgid "Disable pin/unpin app notifications" msgstr "" -#: prefs.js:1387 +#: prefs.js:1938 msgid "Disable Notifications" msgstr "" -#: prefs.js:1402 -msgid "Keyboard" +#: prefs.js:1953 +msgid "" +"V-Shell Modules (allows you to disable modules that conflict with another " +"extension)" msgstr "" -#: prefs.js:1408 -msgid "Override Page Up/Down Shortcuts" +#: prefs.js:1959 +msgid "WindowSearchProvider" msgstr "" -#: prefs.js:1409 +#: prefs.js:1960 msgid "" -"This option automatically overrides the (Shift +) Super + Page Up/Down " -"keyboard shortcuts for the current workspace orientation. If you encounter " -"any issues, check the configuration in the dconf editor." +"Activates the window search provider that adds open windows to the search " +"results. You can search app names and window titles. You can also use \"wq//" +"\" prefix (also by pressing the Space hotkey in the overview, or clicking " +"dash icon) to suppress results from other search providers" msgstr "" -#: prefs.js:1417 -msgid "Compatibility" +#: prefs.js:1968 +msgid "RecentFilesSearchProvider" msgstr "" -#: prefs.js:1423 -msgid "Fix for Dash to Dock" +#: prefs.js:1969 +msgid "" +"Activates the recent files search provider that can be triggered by a dash " +"icon, Ctrl + Space hotkey or by typing \"fq//\" prefix in the search entry " +"field. This option needs File History option enabled in the GNOME Privacy " +"settings" msgstr "" -#: prefs.js:1424 -msgid "" -"With the default Ubuntu Dock and other Dash To Dock forks, you may " -"experience issues with Activities overview after you change Dock position or " -"change monitors configuration. If you are experiencing such issues, try to " -"enable this option, or (better) disable/replace the dock extension." +#: prefs.js:1977 +msgid "ExtensionsSearchProvider" msgstr "" -#: prefs.js:1432 +#: prefs.js:1978 msgid "" -"V-Shell Modules that can be disabled in case of conflict or misbehavior." +"Activates the extensions search provider that adds extensions to the search " +"results. You can also use \"eq//\" prefix (also by pressing the Ctrl + Shift " +"+ Space hotkey in the overview, or clicking dash icon) to suppress results " +"from other search providers" msgstr "" -#: prefs.js:1438 -msgid "AppFavorites" +#: prefs.js:1986 +msgid "AppDisplay / IconGrid" msgstr "" -#: prefs.js:1439 -msgid "Pin/unpin app notification options." +#: prefs.js:1987 +msgid "App grid customization and options" msgstr "" -#: prefs.js:1447 -msgid "AppDisplay / IconGrid" +#: prefs.js:1995 +msgid "AppFavorites" msgstr "" -#: prefs.js:1448 -msgid "App grid customization and options." +#: prefs.js:1996 +msgid "Pin/unpin app notification options" msgstr "" -#: prefs.js:1457 -msgid "Dash configuration options and support for vertical orientation." +#: prefs.js:2005 +msgid "Dash customization and options, support for vertical orientation" msgstr "" -#: prefs.js:1466 -msgid "" -"Hot corner options, removes right panel barrier that collides with CHC-E " -"extension." +#: prefs.js:2014 +msgid "Hot corner options" msgstr "" -#: prefs.js:1474 +#: prefs.js:2022 msgid "MessageTray" msgstr "" -#: prefs.js:1475 -msgid "Notification position options." +#: prefs.js:2023 +msgid "Notification position options" msgstr "" -#: prefs.js:1484 -msgid "Panel options." +#: prefs.js:2031 +msgid "OsdWindow" msgstr "" -#: prefs.js:1493 -msgid "Search view and app search provider customization and options." +#: prefs.js:2032 +msgid "OSD position options" +msgstr "" + +#: prefs.js:2040 +msgid "OverlayKey" +msgstr "" + +#: prefs.js:2041 +msgid "Overlay (Super/Window) key options" msgstr "" -#: prefs.js:1501 +#: prefs.js:2050 +msgid "Panel options" +msgstr "" + +#: prefs.js:2059 +msgid "Search view and app search provider customization and options" +msgstr "" + +#: prefs.js:2067 +msgid "SearchController" +msgstr "" + +#: prefs.js:2068 +msgid "Escape key behavior options in the overview" +msgstr "" + +#: prefs.js:2076 msgid "SwipeTracker" msgstr "" -#: prefs.js:1502 -msgid "Gestures for vertical workspace orientation." +#: prefs.js:2077 +msgid "Gestures for vertical workspace orientation" msgstr "" -#: prefs.js:1510 +#: prefs.js:2085 msgid "WindowAttentionHandler" msgstr "" -#: prefs.js:1511 -msgid "Window attention handler options." +#: prefs.js:2086 +msgid "Window attention handler options" msgstr "" -#: prefs.js:1519 +#: prefs.js:2094 msgid "WindowManager" msgstr "" -#: prefs.js:1520 +#: prefs.js:2095 msgid "" -"Fixes an upstream bug in the minimization animation of a full-screen window." +"Fixes an upstream bug in the minimization animation of a full-screen window" msgstr "" -#: prefs.js:1528 +#: prefs.js:2103 msgid "WindowPreview" msgstr "" -#: prefs.js:1529 +#: prefs.js:2104 msgid "" "Window preview options, fixes an upstream bug that fills the system log with " -"errors when you close a window from an overview or exit the overview with a " -"gesture when any window is selected." +"errors when you close a window from the overview or exit the overview with a " +"gesture when any window is selected" msgstr "" -#: prefs.js:1537 +#: prefs.js:2112 +msgid "WindowThumbnail" +msgstr "" + +#: prefs.js:2113 +msgid "" +"Create Window Thumbnail (PIP) option in the app icon menu and window preview " +"actions" +msgstr "" + +#: prefs.js:2121 msgid "Workspace" msgstr "" -#: prefs.js:1538 +#: prefs.js:2122 msgid "" "Fixes workspace preview allocations for vertical workspaces orientation and " -"window scaling in static overview modes." +"window scaling in static overview modes" msgstr "" -#: prefs.js:1546 +#: prefs.js:2130 msgid "WorkspaceAnimation" msgstr "" -#: prefs.js:1547 -msgid "Static workspace animation option." +#: prefs.js:2131 +msgid "Static workspace animation option" msgstr "" -#: prefs.js:1555 +#: prefs.js:2139 msgid "WorkspaceSwitcherPopup" msgstr "" -#: prefs.js:1556 -msgid "Workspace switcher popup position options." +#: prefs.js:2140 +msgid "Workspace switcher popup orientation and position options" +msgstr "" + +#: prefs.js:2156 +msgid "Keyboard" +msgstr "" + +#: prefs.js:2162 +msgid "Override Page Up/Down Shortcuts" +msgstr "" + +#: prefs.js:2163 +msgid "" +"This option automatically overrides the (Shift +) Super + Page Up/Down " +"keyboard shortcuts for the current workspace orientation. If you encounter " +"any issues, check the configuration in the dconf editor" +msgstr "" + +#: prefs.js:2186 +msgid "Performance" +msgstr "" + +#: prefs.js:2192 +msgid "Smooth App Grid Animations" +msgstr "" + +#: prefs.js:2193 +msgid "" +"This option allows V-Shell to pre-realize app grid and app folders during " +"session startup in order to avoid stuttering animations when using them for " +"the first time. If enabled, the session startup needs a little bit more time " +"to finish and necessary memory will be allocated at this time" +msgstr "" + +#: prefs.js:2201 +msgid "Workarounds" +msgstr "" + +#: prefs.js:2207 +msgid "Fix New Window Not In Focus" msgstr "" -#: prefs.js:1573 +#: prefs.js:2208 +msgid "" +"If you often find that the app window you open from the Activities overview " +"does not get focus, try enabling this option." +msgstr "" + +#: prefs.js:2216 +msgid "Fix New Window Not On Current Monitor" +msgstr "" + +#: prefs.js:2217 +msgid "" +"If you use multiple monitors, you may encounter the issue of new windows " +"opening on a different monitor than expected. This option moves those " +"windows to the current monitor, determined by the position of the mouse " +"pointer. However, this is a workaround, and some windows may override it, " +"moving the window back to the previous monitor during initialization" +msgstr "" + +#: prefs.js:2238 msgid "Version" msgstr "" -#: prefs.js:1579 +#: prefs.js:2244 msgid "Reset all options" msgstr "" -#: prefs.js:1580 +#: prefs.js:2245 msgid "Set all options to default values." msgstr "" -#: prefs.js:1586 +#: prefs.js:2251 msgid "Links" msgstr "" -#: prefs.js:1590 +#: prefs.js:2255 msgid "Homepage" msgstr "" -#: prefs.js:1591 +#: prefs.js:2256 msgid "Source code and more info about this extension" msgstr "" -#: prefs.js:1596 +#: prefs.js:2261 msgid "Changelog" msgstr "" -#: prefs.js:1597 +#: prefs.js:2262 msgid "See what's changed." msgstr "" -#: prefs.js:1602 +#: prefs.js:2267 msgid "GNOME Extensions" msgstr "" -#: prefs.js:1603 -msgid "Rate and comment the extension on GNOME Extensions site." +#: prefs.js:2268 +msgid "Rate and comment V-Shell on the GNOME Extensions site" msgstr "" -#: prefs.js:1608 +#: prefs.js:2273 msgid "Report a bug or suggest new feature" msgstr "" -#: prefs.js:1614 +#: prefs.js:2274 +msgid "Help me to help you!" +msgstr "" + +#: prefs.js:2279 msgid "Buy Me a Coffee" msgstr "" -#: prefs.js:1615 -msgid "If you like this extension, you can help me with my coffee expenses." +#: prefs.js:2280 +msgid "If you like V-Shell, you can help me with my coffee expenses" msgstr "" -#: recentFilesSearchProvider.js:109 -msgid "Search recent files" +#: lib/windowSearchProvider.js:124 lib/windowSearchProvider.js:126 +msgid "Open Windows" +msgstr "" + +#: lib/windowSearchProvider.js:125 +msgid "Search open windows" +msgstr "" + +#: lib/overviewControls.js:813 +msgid "" +"Overview background crashed!\n" +"If you are using Blur My Shell, disable overview blur in its settings and re-" +"enable V-Shell Overview Background to avoid visual glitches." +msgstr "" + +#: lib/dash.js:1296 +msgid "Force Quit" +msgstr "" + +#: lib/dash.js:1313 +msgid "Move App to Current Workspace ( Shift + Click )" msgstr "" -#: recentFilesSearchProvider.js:110 +#: lib/dash.js:1368 +msgid "Search Open Windows (Hotkey: Space)" +msgstr "" + +#: lib/dash.js:1409 +msgid "Search Recent Files (Hotkey: Shift + Space)" +msgstr "" + +#: lib/dash.js:1444 +msgid "Search Extensions (Hotkey: Ctrl + Space)" +msgstr "" + +#: lib/search.js:275 +msgid "Searching…" +msgstr "" + +#: lib/search.js:277 +msgid "No results." +msgstr "" + +#: lib/optionsFactory.js:295 +msgid "Reset profile to defaults" +msgstr "" + +#: lib/optionsFactory.js:303 +msgid "GNOME 3" +msgstr "" + +#: lib/optionsFactory.js:304 +msgid "GNOME 40+ - Bottom Hot Edge" +msgstr "" + +#: lib/optionsFactory.js:305 +msgid "Hot Corner Centric - Top Left Hot Corner" +msgstr "" + +#: lib/optionsFactory.js:306 +msgid "Dock Overview - Bottom Hot Edge" +msgstr "" + +#: lib/optionsFactory.js:328 +msgid "Load profile" +msgstr "" + +#: lib/optionsFactory.js:337 +msgid "Save current settings into this profile" +msgstr "" + +#: lib/recentFilesSearchProvider.js:106 lib/recentFilesSearchProvider.js:108 msgid "Recent Files" msgstr "" + +#: lib/recentFilesSearchProvider.js:107 +msgid "Search recent files" +msgstr "" + +#: lib/extensionsSearchProvider.js:127 +msgid "Search extensions" +msgstr "" + +#: lib/extensionsSearchProvider.js:128 +msgid "Extensions" +msgstr "" diff --git a/extensions/45/vertical-workspaces/prefs.js b/extensions/45/vertical-workspaces/prefs.js index 1369c83..24e404d 100644 --- a/extensions/45/vertical-workspaces/prefs.js +++ b/extensions/45/vertical-workspaces/prefs.js @@ -3,7 +3,7 @@ * prefs.js * * @author GdH <G-dH@github.com> - * @copyright 2022 - 2023 + * @copyright 2022 - 2024 * @license GPL-3.0 */ @@ -26,43 +26,36 @@ export default class VShell extends ExtensionPreferences { const itemFactory = new OptionsFactory.ItemFactory(); const pageList = [ { - name: 'profiles', title: _('Profiles'), iconName: 'open-menu-symbolic', optionList: this._getProfilesOptionList(itemFactory), }, { - name: 'layout', title: _('Layout'), iconName: 'view-grid-symbolic', optionList: this._getLayoutOptionList(itemFactory), }, { - name: 'appearance', title: _('Appearance'), iconName: 'view-reveal-symbolic', optionList: this._getAppearanceOptionList(itemFactory), }, { - name: 'behavior', title: _('Behavior'), iconName: 'system-run-symbolic', optionList: this._getBehaviorOptionList(itemFactory), }, { - name: 'modules', title: _('Modules'), iconName: 'application-x-addon-symbolic', optionList: this._getModulesOptionList(itemFactory), }, { - name: 'misc', title: _('Misc'), iconName: 'preferences-other-symbolic', optionList: this._getMiscOptionList(itemFactory), }, { - name: 'about', title: _('About'), iconName: 'preferences-system-details-symbolic', optionList: this._getAboutOptionList(itemFactory), @@ -153,14 +146,13 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Dash Position'), null, - // // itemFactory.newComboBox(), itemFactory.newDropDown(), 'dashPosition', [ - [_('Top'), 0], - [_('Right'), 1], [_('Bottom'), 2], [_('Left'), 3], + [_('Top'), 0], + [_('Right'), 1], [_('Hide'), 4], ], 'dashModule' @@ -202,7 +194,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Show Apps Icon Position'), _('Sets the position of the "Show Applications" icon in the Dash'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'showAppsIconPosition', [ @@ -216,55 +207,6 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( - _('Open Windows Icon Position'), - _('Allows to add "Search Open Windows" icon into Dash (if window search provider enabled on the Modules tab) so you can directly toggle window search provider results. You can also use the secondary mouse button click on the Show Apps Icon, or the Space hotkey'), - // itemFactory.newComboBox(), - itemFactory.newDropDown(), - 'dashShowWindowsIcon', - [ - [_('Hide'), 0], - [_('Start'), 1], - [_('End'), 2], - ], - 'dashModule' - ) - ); - - optionList.push( - itemFactory.getRowWidget( - _('Recent Files Icon Position'), - _('Allows to add "Search Recent Files" icon into Dash (if recent files search provider enabled on the Modules tab) so you can directly toggle recent files search provider results. You can also use Ctrl + Space hotkey'), - // itemFactory.newComboBox(), - itemFactory.newDropDown(), - 'dashShowRecentFilesIcon', - [ - [_('Hide'), 0], - [_('Start'), 1], - [_('End'), 2], - ], - 'dashModule' - ) - ); - - optionList.push( - itemFactory.getRowWidget( - _('Extensions Icon Position'), - _('Allows to add "Search Extensions" icon into Dash (if extensions search provider enabled on the Module tab) so you can directly toggle extensions search provider results. You can also use the Ctrl + Shift + Space hotkey'), - // itemFactory.newComboBox(), - itemFactory.newDropDown(), - 'dashShowExtensionsIcon', - [ - [_('Hide'), 0], - [_('Start'), 1], - [_('End'), 2], - ], - 'dashModule' - ) - ); - - - optionList.push( - itemFactory.getRowWidget( _('Workspace Thumbnails / Orientation') ) ); @@ -273,7 +215,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Thumbnails Position / Workspaces Orientation'), _('Position of the workspace thumbnails on the screen also sets orientation of the workspaces to vertical or horizontal. You have two options to disable workspace thumbnails, one sets workspaces to vertical orientation, the second one to horizontal.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'workspaceThumbnailsPosition', // this mess is just because of backward compatibility @@ -483,7 +424,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Main Panel Position'), _('Allows to place the main panel at the bottom of the primary display'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'panelPosition', [ @@ -498,7 +438,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Main Panel Visibility'), _('Allows to hide main panel when not needed'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'panelVisibility', [ @@ -570,7 +509,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Notification Banner Position'), _('Choose where the notification banners appear on the screen'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'notificationPosition', [ @@ -589,7 +527,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('OSD Popup Position'), _('Choose where the OSD pop-ups (like sound volume level) appear on the screen'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'osdPosition', [ @@ -616,7 +553,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Workspace Thumbnails Position'), _('Allows to place workspace thumbnails of secondary monitors on the opposite side than on the primary monitor'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'secWsThumbnailsPosition', [ @@ -684,8 +620,8 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( - _('Shift Workspace Preview by Panel Height'), - _('This option can help align overview of the secondary monitor with the primary monitor'), + _('Shift Overview by Panel Height'), + _('This option can help align the overview of the secondary monitor with the primary one'), itemFactory.newSwitch(), 'secWsPreviewShift' ) @@ -712,7 +648,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Dash Max Icon Size'), _('Maximum size of Dash icons in pixels'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'dashMaxIconSize', [ @@ -732,7 +667,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Dash Background Style'), _('Allows you to change the background color of the dash to match the search results an app folders'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'dashBgColor', [ @@ -796,7 +730,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Running App Indicator'), _('Allows you to change style of the running app indicator under the app icon'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'runningDotStyle', [ @@ -817,7 +750,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Show Workspace Thumbnail Labels'), _('Each workspace thumbnail can show label with its index and name (if defined in the system settings) or name/title of its most recently used app/window'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'showWsTmbLabels', [ @@ -858,7 +790,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Window Preview App Icon Size'), null, - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'winPreviewIconSize', [ @@ -876,7 +807,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Window Title Position / Visibility'), _('Sets the position of the window title that is displayed when the mouse hovers over the window or can always be visible'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'winTitlePosition', [ @@ -943,7 +873,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Icon Size'), _('Allows to set a fixed app grid icon size and bypass the default adaptive algorithm'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridIconSize', [ @@ -971,7 +900,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Folder Icon Size'), _('Allows to set a fixed icon size and bypass the default adaptive algorithm in the open folder dialog'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridFolderIconSize', [ @@ -1102,7 +1030,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Search Icon Size'), _('Size of results provided by the App Search Provider - smaller size allows to fit more results'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'searchIconSize', [ @@ -1141,6 +1068,20 @@ export default class VShell extends ExtensionPreferences { ) ); + optionList.push( + itemFactory.getRowWidget( + _('Highlighting'), + _('The GNOME default highlighting style (bold) causes strings to be "randomly" ellipsized, often preventing you from seeing the whole string, even if there is space for it. The selected style will be applied to all search results globally. If you are using other extensions that offer this option, make sure you set the same setting in all of them.'), + itemFactory.newDropDown(), + 'highlightingStyle', + [ + [_('Bold (Default)'), 0], + [_('Underline'), 1], + [_('None'), 2], + ] + ) + ); + optionList.push( itemFactory.getRowWidget( @@ -1234,31 +1175,6 @@ export default class VShell extends ExtensionPreferences { ) ); - - optionList.push( - itemFactory.getRowWidget( - _('Window Thumbnails (PIP)') - ) - ); - - const winTmbAdjustment = new Gtk.Adjustment({ - upper: 50, - lower: 5, - step_increment: 1, - page_increment: 1, - }); - - const winTmbScale = itemFactory.newScale(winTmbAdjustment); - winTmbScale.add_mark(15, Gtk.PositionType.TOP, null); - optionList.push( - itemFactory.getRowWidget( - _('Default Window Thumbnail (PIP) Scale (% of screen height)'), - _('Default scale of window thumbnail (like Picture In Picture) that you can create using the app icon menu or window preview action'), - winTmbScale, - 'windowThumbnailScale' - ) - ); - return optionList; } // ---------------------------------------------------------------- @@ -1276,7 +1192,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Overview Mode'), _('The Expose Windows on Hover mode does not expose the workspace preview windows until the mouse pointer enters any window\nThe Static Workspace mode keeps the workspace static when you activate the overview, it only shows Dash, workspace thumbnails and search entry over the workspace and only clicking on an active workspace thumbnail activates the default overview'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'overviewMode', [ @@ -1291,7 +1206,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Startup State'), _('Allows to change the state in which GNOME Shell starts a session'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'startupState', [ @@ -1306,7 +1220,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Escape Key Behavior'), _('Allows you to close the overview with a single press of the Escape key, even from the application grid or from search, if the search entry field does not have focus'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'overviewEscBehavior', [ @@ -1326,14 +1239,13 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( _('Single-Press Action'), - _('Disable or change behavior when you press and release the Super key. The "Search Windows" options requires the WindowSearchProvider module to be activated'), - // itemFactory.newComboBox(), + _('Disable or change behavior when you press and release the Super key. The "Search Windows" options requires the "WSP (Window Search Provider)" extension installed and enabled. Link is available on the Modules tab in Settings'), itemFactory.newDropDown(), 'overlayKeyPrimary', [ [_('Disable'), 0], [_('Follow Global Overview Mode'), 1], - [_('Overview (Default)'), 2], + [_('Overview - Window Picker (Default)'), 2], [_('Applications'), 3], [_('Overview - Static WS Preview'), 4], [_('Overview - Static Workspace'), 5], @@ -1347,8 +1259,7 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( _('Double-Press Action'), - _('Disable or change behavior when you double-press the Super key. The "Search Windows" option requires the WindowSearchProvider module to be activated. The "Static WS Overview - Expose Windows" option allows you to switch to default Activities Overview window picker view if you set static workspace (preview) for the single press/release Super key action'), - // itemFactory.newComboBox(), + _('Disable or change behavior when you double-press the Super key. The "Search Windows" option requires the "WSP (Window Search Provider)" extension installed and enabled. The "Static WS Overview - Expose Windows" option allows you to switch to default Activities Overview window picker view if you set static workspace (preview) for the single press/release Super key action'), itemFactory.newDropDown(), 'overlayKeySecondary', [ @@ -1372,7 +1283,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Hot Corner Action'), _('Disable or change behavior of the hot corner. Holding down the Ctrl key while hitting the hot corner switches between Overview/Applications actions'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'hotCornerAction', [ @@ -1392,7 +1302,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Hot Corner Position'), _('Choose which corner of your monitors will be active. If you choose "Follow Dash" option, the corner will be placed near the left or top edge of the Dash. The last option extends the hot corner trigger to cover the entire ege of the monitor where Dash is located'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'hotCornerPosition', [ @@ -1451,7 +1360,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Icon - Click Behavior'), _('Choose your preferred behavior when clicking on an app icon. The "Prefer Current Workspace" option opens a new app window if not present in the current workspace. The "Open New Window" option also switches behavior of the middle click to "Activate" since its default behavior is to open a new window'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'dashShowWindowsBeforeActivation', [ @@ -1468,7 +1376,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Icon - Scroll Action'), _('Choose the behavior when scrolling over an app icon. The window cycler works with a list of windows sorted by the "Most Recently Used" and grouped by workspaces. Scrolling up cycles through previously used windows on the same workspace and then switches to another workspace, if any'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'dashIconScroll', [ @@ -1484,7 +1391,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Search Windows Icon - Scroll Action'), _('Choose the behavior when scrolling over the Search Windows icon. The window cycler works with a list of windows sorted by "Most Recently Used" of the current workspace or all workspaces. Scrolling up cycles through previously used windows on the same workspace, or all windows regardless workspace. This option is mainly useful for the static workspace overview mode.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'searchWindowsIconScroll', [ @@ -1506,7 +1412,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Close Workspace Button'), _('The Close Workspace button appears on the workspace thumbnail when you hover over it and allows you to close all windows on the workspace. You can choose a "safety lock" to prevent accidental use'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'closeWsButtonMode', [ @@ -1528,14 +1433,13 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Secondary Button Click Action'), _('Allows you to add a secondary mouse click action to the window preview'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'winPreviewSecBtnAction', [ [_('Activate Window (Default)'), 0], [_('Close Window'), 1], [_('Search For Same App Windows'), 2], - [_('Create Window Thumbnail - PIP'), 3], + [_('Create Window Thumbnail/PiP (requires WTMB extension)'), 3], ], 'windowPreviewModule' ) @@ -1545,14 +1449,13 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Middle Button Click Action'), _('Allows you to add a middle mouse click action to the window preview'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'winPreviewMidBtnAction', [ [_('Activate Window (Default)'), 0], [_('Close Window'), 1], [_('Search For Same App Windows'), 2], - [_('Create Window Thumbnail - PIP'), 3], + [_('Create Window Thumbnail/PiP (requires WTMB extension)'), 3], ], 'windowPreviewModule' ) @@ -1562,13 +1465,12 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Icon Click Action'), _('Select the action to take when the application icon on the window preview is clicked'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'windowIconClickAction', [ [_('Activate Window (Default)'), 0], [_('Search For Same App Windows'), 1], - [_('Create Window Thumbnail - PIP'), 2], + [_('Create Window Thumbnail/PiP (requires WTMB extension)'), 2], ], 'windowPreviewModule' ) @@ -1595,7 +1497,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Grid Order'), _('Choose sorting method for the app grid. Note that sorting by usage ignores folders'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridOrder', [ @@ -1612,7 +1513,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Folder Order'), _('Choose sorting method for app folders'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appFolderOrder', [ @@ -1628,7 +1528,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Grid Content'), _('The default Shell removes favorite apps, this option allows to duplicate them in the grid or remove also running applications. Option "Favorites and Running First" only works with the Alphabet and Usage sorting'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridContent', [ @@ -1679,7 +1578,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Labels Behavior'), _('Choose how and when to display app names'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridNamesMode', [ @@ -1718,40 +1616,13 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( - _('Window Search Provider - Sorting'), - _('Choose the window sorting method'), - // itemFactory.newComboBox(), - itemFactory.newDropDown(), - 'searchWindowsOrder', - [ - [_('Most Recently Used (MRU)'), 0], - [_('MRU - Current Workspace First'), 1], - [_('MRU - By Workspaces'), 2], - [_('Stable Sequence - By Workspaces'), 3], - ], - 'windowSearchProviderModule' - ) - ); - - optionList.push( - itemFactory.getRowWidget( _('Enable Fuzzy Match'), - _('Enabling the fuzzy match allows you to skip letters in the pattern you are searching for and find "Firefox" even if you type "ffx". Works only for the App, Window and Recent files search providers'), + _('Enabling the fuzzy match allows you to skip letters in the pattern you are searching for and find "Firefox" even if you type "ffx". Works only for the App, Windows, Extensions and Recent files search providers'), itemFactory.newSwitch(), 'searchFuzzy' ) ); - /* const wspCommandSwitch = itemFactory.newSwitch(); - optionList.push( - itemFactory.getRowWidget( - _('Enable Commands in Search Entry'), - _('You can use following commands separated by the space at the end of entered pattern:\n/x! \t\t\t- close selected window\n/xa! \t\t\t- close all found windows\n/m[number] \t\t- (e.g. /m6) move selected window to workspace with given index\n/ma[number] \t- move all found windows to workspace with given index'), - wspCommandSwitch, - 'searchWindowsCommands' - ) - );*/ - optionList.push( itemFactory.getRowWidget( _('Animations - General') @@ -1786,7 +1657,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('App Grid Animation'), _('When entering the App Grid view, the app grid animates from the edge of the screen. You can choose the direction, keep the Default (direction will be selected automatically) or disable the animation if you don\'t like it'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'appGridAnimation', [ @@ -1804,7 +1674,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Search View Animation'), _('When search is activated the search view with search results can animate from the edge of the screen. You can choose the direction, keep the Default (currently Bottom to Top) or disable the animation if you don\'t like it.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'searchViewAnimation', [ @@ -1823,7 +1692,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Workspace Preview Animation'), _('When entering / leaving the App Grid / Search view, the workspace preview can animate to/from workspace thumbnail.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'workspaceAnimation', [ @@ -1862,7 +1730,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Workspace Switcher Animation'), _('Allows you to disable movement of the desktop background during workspace switcher animation outside of the overview. The Static Background mode also keeps Conky and desktop icons on their place during switching.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'workspaceSwitcherAnimation', [ @@ -1875,9 +1742,22 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( + _('Workspace Switcher Mode (Isolate Monitors)'), + _('Note that this is a workaround, not full-fledged feature. GNOME Shell does not support separate workspaces for each monitor, so V-Shell switches workspaces only on the primary monitor and moves windows across workspaces on secondary monitors in order to simulate independent behavior. The current monitor is determined by the position of the mouse pointer'), + itemFactory.newDropDown(), + 'wsSwitcherMode', + [ + [_('Default'), 0], + [_('Current Monitor'), 1], + ], + 'windowManagerModule' + ) + ); + + optionList.push( + itemFactory.getRowWidget( _('Workspace Switcher Popup Mode'), _('This popup shows up when you switch workspace using a keyboard shortcut or gesture outside of the overview. You can to disable the popup at all, or show it on the current monitor (the one with mouse pointer) instead of the primary.'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'wsSwPopupMode', [ @@ -1899,7 +1779,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Window Attention Handler'), _('When a window requires attention (often a new window), GNOME Shell shows you a notification about it. You can disable popups of these messages (notification will be pushed into the message tray silently) or focus the source window immediately instead'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'windowAttentionMode', [ @@ -1915,7 +1794,6 @@ export default class VShell extends ExtensionPreferences { itemFactory.getRowWidget( _('Favorites'), _('Disable pin/unpin app notifications'), - // itemFactory.newComboBox(), itemFactory.newDropDown(), 'favoritesNotify', [ @@ -1941,28 +1819,25 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( - _('WindowSearchProvider'), - _('Activates the window search provider that adds open windows to the search results. You can search app names and window titles. You can also use "wq//" prefix (also by pressing the Space hotkey in the overview, or clicking dash icon) to suppress results from other search providers'), - itemFactory.newSwitch(), - 'windowSearchProviderModule' + _('Windows Search Provider - Moved from V-Shell to the standalone "WSP" extension'), + _('NOTE: This module has been released as a standalone extension with new features, click to learn more. Related V-Shell options are still available if you install the WSP extension.\n\nWSP adds adds open windows to the search results. You can search app names and window titles. You can also use "wq//" or custom prefix (also by pressing the Space hotkey in the overview, or clicking dash icon) to suppress results from other search providers'), + itemFactory.newLinkButton('https://github.com/G-dH/windows-search-provider?tab=readme-ov-file#wsp-windows-search-provider') ) ); optionList.push( itemFactory.getRowWidget( - _('RecentFilesSearchProvider'), - _('Activates the recent files search provider that can be triggered by a dash icon, Ctrl + Space hotkey or by typing "fq//" prefix in the search entry field. This option needs File History option enabled in the GNOME Privacy settings'), - itemFactory.newSwitch(), - 'recentFilesSearchProviderModule' + _('Extensions Search Provider - Moved from V-Shell to the standalone "ESP" extension'), + _('NOTE: This module has been released as a standalone extension with new features, click to learn more. Related V-Shell options are still available if you install the ESP extension.\n\nESP adds extensions to the search results. You can also use "eq//" or custom prefix (also by pressing the Ctrl + Shift + Space hotkey in the overview, or clicking dash icon) to suppress results from other search providers'), + itemFactory.newLinkButton('https://github.com/G-dH/extensions-search-provider?tab=readme-ov-file#esp-extensions-search-provider') ) ); optionList.push( itemFactory.getRowWidget( - _('ExtensionsSearchProvider'), - _('Activates the extensions search provider that adds extensions to the search results. You can also use "eq//" prefix (also by pressing the Ctrl + Shift + Space hotkey in the overview, or clicking dash icon) to suppress results from other search providers'), - itemFactory.newSwitch(), - 'extensionsSearchProviderModule' + _('Window Thumbnails (PiP) - Moved from V-Shell to the standalone "WTMB" extension'), + _('NOTE: This module has been released as a standalone extension with new features, click to learn more. Related V-Shell options are still available if you install the WTMB extension.\n\nWTMB allows the creation of Picture-in-Picture like window thumbnails that you can use for monitoring of windows on another workspace'), + itemFactory.newLinkButton('https://github.com/G-dH/window-thumbnails?tab=readme-ov-file#wtmb-window-thumbnails') ) ); @@ -2094,15 +1969,6 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( - _('WindowThumbnail'), - _('Create Window Thumbnail (PIP) option in the app icon menu and window preview actions'), - itemFactory.newSwitch(), - 'windowThumbnailModule' - ) - ); - - optionList.push( - itemFactory.getRowWidget( _('Workspace'), _('Fixes workspace preview allocations for vertical workspaces orientation and window scaling in static overview modes'), itemFactory.newSwitch(), @@ -2122,7 +1988,7 @@ export default class VShell extends ExtensionPreferences { optionList.push( itemFactory.getRowWidget( _('WorkspaceSwitcherPopup'), - _('Workspace switcher popup position options'), + _('Workspace switcher popup orientation and position options'), itemFactory.newSwitch(), 'workspaceSwitcherPopupModule' ) @@ -2196,6 +2062,15 @@ export default class VShell extends ExtensionPreferences { ) ); + optionList.push( + itemFactory.getRowWidget( + _('Fix New Window Not On Current Monitor (experimental)'), + _('If you use multiple monitors, you may encounter the issue of new windows opening on a different monitor than expected. This option moves those windows to the current monitor, determined by the position of the mouse pointer. However, this is a workaround, and some windows may override it, moving the window back to the previous monitor during initialization'), + itemFactory.newSwitch(), + 'newWindowMonitorFix' + ) + ); + return optionList; } @@ -2218,7 +2093,7 @@ export default class VShell extends ExtensionPreferences { optionList.push(itemFactory.getRowWidget( _('Reset all options'), - _('Set all options to default values.'), + _('Reset all options to their default values'), itemFactory.newOptionsResetButton() )); @@ -2253,7 +2128,7 @@ export default class VShell extends ExtensionPreferences { optionList.push(itemFactory.getRowWidget( _('Buy Me a Coffee'), - _('If you like V-Shell, you can help me with my coffee expenses'), + _('Enjoying V-Shell? Consider supporting it by buying me a coffee!'), itemFactory.newLinkButton('https://buymeacoffee.com/georgdh') )); diff --git a/extensions/45/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml b/extensions/45/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml index ecaacd1..ff1e205 100644 --- a/extensions/45/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml +++ b/extensions/45/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml @@ -14,7 +14,7 @@ <default>350</default> </key> <key type="i" name="ws-preview-scale"> - <default>95</default> + <default>100</default> </key> <key type="i" name="secondary-ws-preview-scale"> <default>100</default> @@ -23,13 +23,13 @@ <default>false</default> </key> <key type="i" name="dash-position"> - <default>2</default> + <default>0</default> </key> <key type="i" name="dash-position-adjust"> - <default>0</default> + <default>-100</default> </key> <key type="i" name="show-app-icon-position"> - <default>1</default> + <default>0</default> </key> <key type="i" name="dash-show-windows-icon"> <default>1</default> @@ -41,7 +41,7 @@ <default>1</default> </key> <key type="i" name="wst-position-adjust"> - <default>0</default> + <default>-100</default> </key> <key type="i" name="show-wst-labels"> <default>3</default> @@ -80,10 +80,10 @@ <default>48</default> </key> <key type="i" name="dash-bg-opacity"> - <default>85</default> + <default>20</default> </key> <key type="i" name="dash-bg-color"> - <default>0</default> + <default>1</default> </key> <key type="i" name="dash-bg-radius"> <default>18</default> @@ -98,10 +98,10 @@ <default>false</default> </key> <key type="b" name="show-ws-switcher-bg"> - <default>true</default> + <default>false</default> </key> <key type="b" name="show-ws-preview-bg"> - <default>false</default> + <default>true</default> </key> <key type="i" name="ws-preview-bg-radius"> <default>30</default> @@ -110,7 +110,7 @@ <default>true</default> </key> <key type="i" name="overview-bg-blur-sigma"> - <default>0</default> + <default>30</default> </key> <key type="i" name="app-grid-bg-blur-sigma"> <default>40</default> @@ -136,6 +136,9 @@ <key type="i" name="workspace-switcher-animation"> <default>1</default> </key> + <key type="i" name="ws-switcher-mode"> + <default>0</default> + </key> <key type="i" name="animation-speed-factor"> <default>100</default> </key> @@ -146,7 +149,7 @@ <default>0</default> </key> <key type="i" name="startup-state"> - <default>2</default> + <default>0</default> </key> <key type="i" name="overview-mode"> <default>0</default> @@ -266,7 +269,7 @@ <default>1</default> </key> <key type="i" name="hot-corner-position"> - <default>6</default> + <default>0</default> </key> <key type="b" name="hot-corner-fullscreen"> <default>true</default> @@ -278,7 +281,7 @@ <default>false</default> </key> <key type="i" name="win-preview-sec-mouse-btn-action"> - <default>2</default> + <default>3</default> </key> <key type="i" name="win-preview-mid-mouse-btn-action"> <default>0</default> @@ -301,11 +304,14 @@ <key type="b" name="new-window-focus-fix"> <default>false</default> </key> + <key type="b" name="new-window-monitor-fix"> + <default>false</default> + </key> <key type="b" name="app-grid-performance"> <default>true</default> </key> - <key type="i" name="window-thumbnail-scale"> - <default>15</default> + <key name='highlighting-style' type='i'> + <default>1</default> </key> <key type="b" name="workspace-switcher-popup-module"> @@ -326,9 +332,6 @@ <key type="b" name="win-attention-handler-module"> <default>true</default> </key> - <key type="b" name="window-thumbnail-module"> - <default>true</default> - </key> <key type="b" name="swipe-tracker-module"> <default>true</default> </key> @@ -362,15 +365,9 @@ <key type="b" name="app-favorites-module"> <default>true</default> </key> - <key type="b" name="window-search-provider-module"> - <default>true</default> - </key> <key type="b" name="recent-files-search-provider-module"> <default>false</default> </key> - <key type="b" name="extensions-search-provider-module"> - <default>true</default> - </key> <key type="b" name="aaa-loading-profile"> <default>false</default> @@ -380,28 +377,504 @@ <default>""</default> </key> <key type="a{ss}" name="profile-data-1"> - <default>{'workspaceThumbnailsPosition': '1', 'wsMaxSpacing': '350', 'wsPreviewScale': '95', 'secWsPreviewScale': '100', 'secWsPreviewShift': 'false', 'wsThumbnailsFull': 'false', 'secWsThumbnailsPosition': '2', 'dashPosition': '3', 'dashPositionAdjust': '0', 'wsTmbPositionAdjust': '-80', 'showWsTmbLabels': '3', 'showWsTmbLabelsOnHover': 'false', 'closeWsButtonMode': '2', 'secWsTmbPositionAdjust': '-80', 'dashMaxIconSize': '64', 'dashShowWindowsIcon': '2', 'dashShowRecentFilesIcon': '2', 'dashShowExtensionsIcon': '2', 'centerDashToWs': 'false', 'showAppsIconPosition': '1', 'wsThumbnailScale': '13', 'wsThumbnailScaleAppGrid': '13', 'secWsThumbnailScale': '13', 'showSearchEntry': 'true', 'centerSearch': 'true', 'centerAppGrid': 'true', 'dashBgOpacity': '80', 'dashBgColor': '0', 'dashBgRadius': '0', 'dashBgGS3Style': 'true', 'runningDotStyle': '1', 'enablePageShortcuts': 'false', 'showWsSwitcherBg': 'true', 'showWsPreviewBg': 'false', 'wsPreviewBgRadius': '30', 'showBgInOverview': 'true', 'overviewBgBrightness': '30', 'searchBgBrightness': '30', 'overviewBgBlurSigma': '0', 'appGridBgBlurSigma': '40', 'smoothBlurTransitions': 'false', 'appGridAnimation': '4', 'searchViewAnimation': '0', 'workspaceAnimation': '1', 'animationSpeedFactor': '100', 'winPreviewIconSize': '1', 'winTitlePosition': '0', 'startupState': '0', 'overviewMode': '0', 'workspaceSwitcherAnimation': '1', 'searchIconSize': '96', 'searchViewScale': '104', 'appGridIconSize': '-1', 'appGridColumns': '0', 'appGridRows': '0', 'appGridFolderIconSize': '-1', 'appGridFolderColumns': '0', 'appGridFolderRows': '0', 'appGridFolderIconGrid': '2', 'appGridContent': '2', 'appGridIncompletePages': 'false', 'appGridOrder': '0', 'appFolderOrder': '0', 'appGridNamesMode': '1', 'appGridActivePreview': 'false', 'appGridFolderCenter': 'false', 'appGridPageWidthScale': '100', 'appGridSpacing': '12', 'searchWindowsOrder': '1', 'searchFuzzy': 'false', 'searchMaxResultsRows': '5', 'dashShowWindowsBeforeActivation': '1', 'dashIconScroll': '1', 'dashIsolateWorkspaces': 'false', 'searchWindowsIconScroll': '1', 'panelVisibility': '0', 'panelPosition': '0', 'windowAttentionMode': '0', 'wsSwPopupHPosition': '50', 'wsSwPopupVPosition': '95', 'wsSwPopupMode': '1', 'wsSwitcherWraparound': 'false', 'wsSwitcherIgnoreLast': 'false', 'favoritesNotify': '1', 'notificationPosition': '1', 'osdPosition': '6', 'hotCornerAction': '1', 'hotCornerPosition': '0', 'hotCornerFullscreen': 'true', 'hotCornerRipples': 'true', 'alwaysActivateSelectedWindow': 'false', 'winPreviewSecBtnAction': '3', 'winPreviewMidBtnAction': '1', 'winPreviewShowCloseButton': 'true', 'windowIconClickAction': '1', 'overlayKeyPrimary': '1', 'overlayKeySecondary': '1', 'overviewEscBehavior': '0', 'newWindowFocusFix': 'false', 'appGridPerformance': 'true', 'windowThumbnailScale': '20', 'workspaceSwitcherPopupModule': 'true', 'workspaceAnimationModule': 'true', 'workspaceModule': 'true', 'windowManagerModule': 'true', 'windowPreviewModule': 'true', 'windowAttentionHandlerModule': 'true', 'windowThumbnailModule': 'true', 'swipeTrackerModule': 'true', 'searchControllerModule': 'true', 'searchModule': 'true', 'panelModule': 'true', 'overlayKeyModule': 'true', 'osdWindowModule': 'true', 'messageTrayModule': 'true', 'layoutModule': 'true', 'dashModule': 'true', 'appFavoritesModule': 'true', 'appDisplayModule': 'true', 'windowSearchProviderModule': 'true', 'extensionsSearchProviderModule': 'true'}</default> + <default>{ + 'workspaceThumbnailsPosition': '1', + 'wsMaxSpacing': '350', + 'wsPreviewScale': '95', + 'secWsPreviewScale': '100', + 'secWsPreviewShift': 'false', + 'wsThumbnailsFull': 'false', + 'secWsThumbnailsPosition': '2', + 'dashPosition': '3', + 'dashPositionAdjust': '0', + 'wsTmbPositionAdjust': '-80', + 'showWsTmbLabels': '3', + 'showWsTmbLabelsOnHover': 'false', + 'closeWsButtonMode': '2', + 'secWsTmbPositionAdjust': '-80', + 'dashMaxIconSize': '64', + 'centerDashToWs': 'false', + 'showAppsIconPosition': '1', + 'wsThumbnailScale': '13', + 'wsThumbnailScaleAppGrid': '13', + 'secWsThumbnailScale': '13', + 'showSearchEntry': 'true', + 'centerSearch': 'true', + 'centerAppGrid': 'true', + 'dashBgOpacity': '80', + 'dashBgColor': '0', + 'dashBgRadius': '0', + 'dashBgGS3Style': 'true', + 'runningDotStyle': '1', + 'enablePageShortcuts': 'false', + 'showWsSwitcherBg': 'true', + 'showWsPreviewBg': 'false', + 'wsPreviewBgRadius': '30', + 'showBgInOverview': 'true', + 'overviewBgBrightness': '30', + 'searchBgBrightness': '30', + 'overviewBgBlurSigma': '0', + 'appGridBgBlurSigma': '40', + 'smoothBlurTransitions': 'false', + 'appGridAnimation': '4', + 'searchViewAnimation': '0', + 'workspaceAnimation': '1', + 'animationSpeedFactor': '100', + 'winPreviewIconSize': '1', + 'winTitlePosition': '0', + 'startupState': '0', + 'overviewMode': '0', + 'wsSwitcherMode': '0', + 'workspaceSwitcherAnimation': '1', + 'searchIconSize': '96', + 'searchViewScale': '104', + 'appGridIconSize': '-1', + 'appGridColumns': '0', + 'appGridRows': '0', + 'appGridFolderIconSize': '-1', + 'appGridFolderColumns': '0', + 'appGridFolderRows': '0', + 'appGridFolderIconGrid': '2', + 'appGridContent': '2', + 'appGridIncompletePages': 'false', + 'appGridOrder': '0', + 'appFolderOrder': '0', + 'appGridNamesMode': '1', + 'appGridActivePreview': 'false', + 'appGridFolderCenter': 'false', + 'appGridPageWidthScale': '100', + 'appGridSpacing': '12', + 'searchWindowsOrder': '1', + 'searchFuzzy': 'false', + 'searchMaxResultsRows': '5', + 'dashShowWindowsBeforeActivation': '1', + 'dashIconScroll': '1', + 'dashIsolateWorkspaces': 'false', + 'searchWindowsIconScroll': '1', + 'panelVisibility': '0', + 'panelPosition': '0', + 'windowAttentionMode': '0', + 'wsSwPopupHPosition': '50', + 'wsSwPopupVPosition': '95', + 'wsSwPopupMode': '1', + 'wsSwitcherWraparound': 'false', + 'wsSwitcherIgnoreLast': 'false', + 'favoritesNotify': '1', + 'notificationPosition': '1', + 'osdPosition': '6', + 'hotCornerAction': '1', + 'hotCornerPosition': '0', + 'hotCornerFullscreen': 'true', + 'hotCornerRipples': 'true', + 'alwaysActivateSelectedWindow': 'false', + 'winPreviewSecBtnAction': '3', + 'winPreviewMidBtnAction': '1', + 'winPreviewShowCloseButton': 'true', + 'windowIconClickAction': '1', + 'overlayKeyPrimary': '1', + 'overlayKeySecondary': '1', + 'overviewEscBehavior': '0', + 'newWindowFocusFix': 'false', + 'newWindowMonitorFix': '0', + 'appGridPerformance': 'true', + 'highlightingStyle': '1', + + 'workspaceSwitcherPopupModule': 'true', + 'workspaceAnimationModule': 'true', + 'workspaceModule': 'true', + 'windowManagerModule': 'true', + 'windowPreviewModule': 'true', + 'windowAttentionHandlerModule': 'true', + 'swipeTrackerModule': 'true', + 'searchControllerModule': 'true', + 'searchModule': 'true', + 'panelModule': 'true', + 'overlayKeyModule': 'true', + 'osdWindowModule': 'true', + 'messageTrayModule': 'true', + 'layoutModule': 'true', + 'dashModule': 'true', + 'appFavoritesModule': 'true', + 'appDisplayModule': 'true' + }</default> </key> <key type="s" name="profile-name-2"> <default>""</default> </key> <key type="a{ss}" name="profile-data-2"> - <default>{'workspaceThumbnailsPosition': '5', 'wsMaxSpacing': '80', 'wsPreviewScale': '100', 'secWsPreviewScale': '100', 'secWsPreviewShift': 'false', 'wsThumbnailsFull': 'false', 'secWsThumbnailsPosition': '2', 'dashPosition': '2', 'dashPositionAdjust': '0', 'wsTmbPositionAdjust': '0', 'showWsTmbLabels': '0', 'showWsTmbLabelsOnHover': 'false', 'closeWsButtonMode': '2', 'secWsTmbPositionAdjust': '0', 'dashMaxIconSize': '64', 'dashShowWindowsIcon': '2', 'dashShowRecentFilesIcon': '2', 'dashShowExtensionsIcon': '2', 'centerDashToWs': 'false', 'showAppsIconPosition': '1', 'wsThumbnailScale': '5', 'wsThumbnailScaleAppGrid': '15', 'secWsThumbnailScale': '5', 'showSearchEntry': 'true', 'centerSearch': 'true', 'centerAppGrid': 'true', 'dashBgOpacity': '20', 'dashBgColor': '1', 'dashBgRadius': '0', 'dashBgGS3Style': 'false', 'runningDotStyle': '1', 'enablePageShortcuts': 'true', 'showWsSwitcherBg': 'false', 'showWsPreviewBg': 'true', 'wsPreviewBgRadius': '30', 'showBgInOverview': 'true', 'overviewBgBrightness': '50', 'searchBgBrightness': '30', 'overviewBgBlurSigma': '50', 'appGridBgBlurSigma': '40', 'smoothBlurTransitions': 'false', 'appGridAnimation': '4', 'searchViewAnimation': '4', 'workspaceAnimation': '1', 'animationSpeedFactor': '100', 'winPreviewIconSize': '1', 'winTitlePosition': '0', 'startupState': '0', 'overviewMode': '0', 'workspaceSwitcherAnimation': '0', 'searchIconSize': '96', 'searchViewScale': '104', 'appGridIconSize': '-1', 'appGridColumns': '0', 'appGridRows': '0', 'appGridFolderIconSize': '-1', 'appGridFolderColumns': '0', 'appGridFolderRows': '0', 'appGridFolderIconGrid': '2', 'appGridContent': '2', 'appGridIncompletePages': 'false', 'appGridOrder': '0', 'appFolderOrder': '0', 'appGridNamesMode': '1', 'appGridActivePreview': 'false', 'appGridFolderCenter': 'true', 'appGridPageWidthScale': '90', 'appGridSpacing': '12', 'searchWindowsOrder': '1', 'searchFuzzy': 'false', 'searchMaxResultsRows': '5', 'dashShowWindowsBeforeActivation': '1', 'dashIconScroll': '1', 'dashIsolateWorkspaces': 'false', 'searchWindowsIconScroll': '1', 'panelVisibility': '0', 'panelPosition': '0', 'windowAttentionMode': '0', 'wsSwPopupHPosition': '50', 'wsSwPopupVPosition': '95', 'wsSwPopupMode': '1', 'wsSwitcherWraparound': 'false', 'wsSwitcherIgnoreLast': 'false', 'favoritesNotify': '1', 'notificationPosition': '1', 'osdPosition': '6', 'hotCornerAction': '1', 'hotCornerPosition': '6', 'hotCornerFullscreen': 'true', 'hotCornerRipples': 'false', 'alwaysActivateSelectedWindow': 'false', 'winPreviewSecBtnAction': '2', 'winPreviewMidBtnAction': '1', 'winPreviewShowCloseButton': 'true', 'windowIconClickAction': '1', 'overlayKeyPrimary': '1', 'overlayKeySecondary': '1', 'overviewEscBehavior': '0', 'newWindowFocusFix': 'false', 'appGridPerformance': 'true', 'windowThumbnailScale': '20', 'workspaceSwitcherPopupModule': 'true', 'workspaceAnimationModule': 'true', 'workspaceModule': 'true', 'windowManagerModule': 'true', 'windowPreviewModule': 'true', 'windowAttentionHandlerModule': 'true', 'windowThumbnailModule': 'true', 'swipeTrackerModule': 'true', 'searchControllerModule': 'true', 'searchModule': 'true', 'panelModule': 'true', 'overlayKeyModule': 'true', 'osdWindowModule': 'true', 'messageTrayModule': 'true', 'layoutModule': 'true', 'dashModule': 'true', 'appFavoritesModule': 'true', 'appDisplayModule': 'true', 'windowSearchProviderModule': 'true', 'extensionsSearchProviderModule': 'true'}</default> + <default>{ + 'workspaceThumbnailsPosition': '5', + 'wsMaxSpacing': '80', + 'wsPreviewScale': '100', + 'secWsPreviewScale': '100', + 'secWsPreviewShift': 'false', + 'wsThumbnailsFull': 'false', + 'secWsThumbnailsPosition': '2', + 'dashPosition': '2', + 'dashPositionAdjust': '0', + 'wsTmbPositionAdjust': '0', + 'showWsTmbLabels': '0', + 'showWsTmbLabelsOnHover': 'false', + 'closeWsButtonMode': '2', + 'secWsTmbPositionAdjust': '0', + 'dashMaxIconSize': '64', + 'centerDashToWs': 'false', + 'showAppsIconPosition': '1', + 'wsThumbnailScale': '5', + 'wsThumbnailScaleAppGrid': '15', + 'secWsThumbnailScale': '5', + 'showSearchEntry': 'false', + 'centerSearch': 'true', + 'centerAppGrid': 'true', + 'dashBgOpacity': '20', + 'dashBgColor': '1', + 'dashBgRadius': '0', + 'dashBgGS3Style': 'false', + 'runningDotStyle': '1', + 'enablePageShortcuts': 'true', + 'showWsSwitcherBg': 'false', + 'showWsPreviewBg': 'true', + 'wsPreviewBgRadius': '30', + 'showBgInOverview': 'true', + 'overviewBgBrightness': '50', + 'searchBgBrightness': '30', + 'overviewBgBlurSigma': '50', + 'appGridBgBlurSigma': '40', + 'smoothBlurTransitions': 'false', + 'appGridAnimation': '4', + 'searchViewAnimation': '0', + 'workspaceAnimation': '1', + 'animationSpeedFactor': '100', + 'winPreviewIconSize': '1', + 'winTitlePosition': '0', + 'startupState': '0', + 'overviewMode': '0', + 'wsSwitcherMode': '0', + 'workspaceSwitcherAnimation': '0', + 'searchIconSize': '96', + 'searchViewScale': '104', + 'appGridIconSize': '-1', + 'appGridColumns': '0', + 'appGridRows': '0', + 'appGridFolderIconSize': '-1', + 'appGridFolderColumns': '0', + 'appGridFolderRows': '0', + 'appGridFolderIconGrid': '2', + 'appGridContent': '2', + 'appGridIncompletePages': 'false', + 'appGridOrder': '0', + 'appFolderOrder': '0', + 'appGridNamesMode': '1', + 'appGridActivePreview': 'false', + 'appGridFolderCenter': 'true', + 'appGridPageWidthScale': '90', + 'appGridSpacing': '12', + 'searchWindowsOrder': '1', + 'searchFuzzy': 'false', + 'searchMaxResultsRows': '5', + 'dashShowWindowsBeforeActivation': '1', + 'dashIconScroll': '1', + 'dashIsolateWorkspaces': 'false', + 'searchWindowsIconScroll': '1', + 'panelVisibility': '0', + 'panelPosition': '0', + 'windowAttentionMode': '0', + 'wsSwPopupHPosition': '50', + 'wsSwPopupVPosition': '95', + 'wsSwPopupMode': '1', + 'wsSwitcherWraparound': 'false', + 'wsSwitcherIgnoreLast': 'false', + 'favoritesNotify': '1', + 'notificationPosition': '1', + 'osdPosition': '6', + 'hotCornerAction': '1', + 'hotCornerPosition': '6', + 'hotCornerFullscreen': 'true', + 'hotCornerRipples': 'false', + 'alwaysActivateSelectedWindow': 'false', + 'winPreviewSecBtnAction': '2', + 'winPreviewMidBtnAction': '1', + 'winPreviewShowCloseButton': 'true', + 'windowIconClickAction': '1', + 'overlayKeyPrimary': '1', + 'overlayKeySecondary': '1', + 'overviewEscBehavior': '0', + 'newWindowFocusFix': 'false', + 'newWindowMonitorFix': '0', + 'appGridPerformance': 'true', + 'highlightingStyle': '1', + + 'workspaceSwitcherPopupModule': 'true', + 'workspaceAnimationModule': 'true', + 'workspaceModule': 'true', + 'windowManagerModule': 'true', + 'windowPreviewModule': 'true', + 'windowAttentionHandlerModule': 'true', + 'swipeTrackerModule': 'true', + 'searchControllerModule': 'true', + 'searchModule': 'true', + 'panelModule': 'true', + 'overlayKeyModule': 'true', + 'osdWindowModule': 'true', + 'messageTrayModule': 'true', + 'layoutModule': 'true', + 'dashModule': 'true', + 'appFavoritesModule': 'true', + 'appDisplayModule': 'true' + }</default> </key> <key type="s" name="profile-name-3"> <default>""</default> </key> <key type="a{ss}" name="profile-data-3"> - <default>{'workspaceThumbnailsPosition': '0', 'wsMaxSpacing': '350', 'wsPreviewScale': '95', 'secWsPreviewScale': '100', 'secWsPreviewShift': 'false', 'wsThumbnailsFull': 'false', 'secWsThumbnailsPosition': '2', 'dashPosition': '0', 'dashPositionAdjust': '-100', 'wsTmbPositionAdjust': '-100', 'showWsTmbLabels': '3', 'showWsTmbLabelsOnHover': 'false', 'closeWsButtonMode': '2', 'secWsTmbPositionAdjust': '0', 'dashMaxIconSize': '48', 'dashShowWindowsIcon': '1', 'dashShowRecentFilesIcon': '1', 'dashShowExtensionsIcon': '1', 'centerDashToWs': 'false', 'showAppsIconPosition': '0', 'wsThumbnailScale': '13', 'wsThumbnailScaleAppGrid': '13', 'secWsThumbnailScale': '13', 'showSearchEntry': 'false', 'centerSearch': 'true', 'centerAppGrid': 'false', 'dashBgOpacity': '20', 'dashBgColor': '1', 'dashBgRadius': '0', 'dashBgGS3Style': 'false', 'runningDotStyle': '1', 'enablePageShortcuts': 'true', 'showWsSwitcherBg': 'false', 'showWsPreviewBg': 'true', 'wsPreviewBgRadius': '30', 'showBgInOverview': 'true', 'overviewBgBrightness': '60', 'searchBgBrightness': '30', 'overviewBgBlurSigma': '30', 'appGridBgBlurSigma': '80', 'smoothBlurTransitions': 'false', 'appGridAnimation': '4', 'searchViewAnimation': '4', 'workspaceAnimation': '1', 'animationSpeedFactor': '100', 'winPreviewIconSize': '1', 'winTitlePosition': '0', 'startupState': '2', 'overviewMode': '1', 'workspaceSwitcherAnimation': '1', 'searchIconSize': '96', 'searchViewScale': '104', 'appGridIconSize': '-1', 'appGridColumns': '0', 'appGridRows': '0', 'appGridFolderIconSize': '-1', 'appGridFolderColumns': '0', 'appGridFolderRows': '0', 'appGridFolderIconGrid': '3', 'appGridContent': '0', 'appGridIncompletePages': 'false', 'appGridOrder': '0', 'appFolderOrder': '0', 'appGridNamesMode': '1', 'appGridActivePreview': 'true', 'appGridFolderCenter': 'false', 'appGridPageWidthScale': '90', 'appGridSpacing': '12', 'searchWindowsOrder': '1', 'searchFuzzy': 'false', 'searchMaxResultsRows': '5', 'dashShowWindowsBeforeActivation': '1', 'dashIconScroll': '1', 'dashIsolateWorkspaces': 'false', 'searchWindowsIconScroll': '1', 'panelVisibility': '0', 'panelPosition': '0', 'windowAttentionMode': '0', 'wsSwPopupHPosition': '50', 'wsSwPopupVPosition': '95', 'wsSwPopupMode': '1', 'wsSwitcherWraparound': 'false', 'wsSwitcherIgnoreLast': 'false', 'favoritesNotify': '0', 'notificationPosition': '2', 'osdPosition': '6', 'hotCornerAction': '1', 'hotCornerPosition': '1', 'hotCornerFullscreen': 'true', 'hotCornerRipples': 'true', 'alwaysActivateSelectedWindow': 'false', 'winPreviewSecBtnAction': '2', 'winPreviewMidBtnAction': '1', 'winPreviewShowCloseButton': 'true', 'windowIconClickAction': '1', 'overlayKeyPrimary': '1', 'overlayKeySecondary': '1', 'overviewEscBehavior': '0', 'newWindowFocusFix': 'false', 'appGridPerformance': 'true', 'windowThumbnailScale': '20', 'workspaceSwitcherPopupModule': 'true', 'workspaceAnimationModule': 'true', 'workspaceModule': 'true', 'windowManagerModule': 'true', 'windowPreviewModule': 'true', 'windowAttentionHandlerModule': 'true', 'windowThumbnailModule': 'true', 'swipeTrackerModule': 'true', 'searchControllerModule': 'true', 'searchModule': 'true', 'panelModule': 'true', 'overlayKeyModule': 'true', 'osdWindowModule': 'true', 'messageTrayModule': 'true', 'layoutModule': 'true', 'dashModule': 'true', 'appFavoritesModule': 'true', 'appDisplayModule': 'true', 'windowSearchProviderModule': 'true', 'extensionsSearchProviderModule': 'true'}</default> + <default>{ + 'workspaceThumbnailsPosition': '0', + 'wsMaxSpacing': '350', + 'wsPreviewScale': '95', + 'secWsPreviewScale': '100', + 'secWsPreviewShift': 'false', + 'wsThumbnailsFull': 'false', + 'secWsThumbnailsPosition': '2', + 'dashPosition': '0', + 'dashPositionAdjust': '-100', + 'wsTmbPositionAdjust': '-100', + 'showWsTmbLabels': '3', + 'showWsTmbLabelsOnHover': 'false', + 'closeWsButtonMode': '2', + 'secWsTmbPositionAdjust': '0', + 'dashMaxIconSize': '48', + 'centerDashToWs': 'false', + 'showAppsIconPosition': '0', + 'wsThumbnailScale': '13', + 'wsThumbnailScaleAppGrid': '13', + 'secWsThumbnailScale': '13', + 'showSearchEntry': 'false', + 'centerSearch': 'true', + 'centerAppGrid': 'false', + 'dashBgOpacity': '15', + 'dashBgColor': '1', + 'dashBgRadius': '0', + 'dashBgGS3Style': 'false', + 'runningDotStyle': '1', + 'enablePageShortcuts': 'true', + 'showWsSwitcherBg': 'false', + 'showWsPreviewBg': 'true', + 'wsPreviewBgRadius': '30', + 'showBgInOverview': 'true', + 'overviewBgBrightness': '60', + 'searchBgBrightness': '30', + 'overviewBgBlurSigma': '30', + 'appGridBgBlurSigma': '80', + 'smoothBlurTransitions': 'false', + 'appGridAnimation': '4', + 'searchViewAnimation': '0', + 'workspaceAnimation': '1', + 'animationSpeedFactor': '100', + 'winPreviewIconSize': '1', + 'winTitlePosition': '0', + 'startupState': '2', + 'overviewMode': '1', + 'wsSwitcherMode': '0', + 'workspaceSwitcherAnimation': '1', + 'searchIconSize': '96', + 'searchViewScale': '104', + 'appGridIconSize': '-1', + 'appGridColumns': '0', + 'appGridRows': '0', + 'appGridFolderIconSize': '-1', + 'appGridFolderColumns': '0', + 'appGridFolderRows': '0', + 'appGridFolderIconGrid': '3', + 'appGridContent': '0', + 'appGridIncompletePages': 'false', + 'appGridOrder': '0', + 'appFolderOrder': '0', + 'appGridNamesMode': '1', + 'appGridActivePreview': 'true', + 'appGridFolderCenter': 'false', + 'appGridPageWidthScale': '90', + 'appGridSpacing': '12', + 'searchWindowsOrder': '1', + 'searchFuzzy': 'false', + 'searchMaxResultsRows': '5', + 'dashShowWindowsBeforeActivation': '1', + 'dashIconScroll': '1', + 'dashIsolateWorkspaces': 'false', + 'searchWindowsIconScroll': '1', + 'panelVisibility': '0', + 'panelPosition': '0', + 'windowAttentionMode': '0', + 'wsSwPopupHPosition': '50', + 'wsSwPopupVPosition': '95', + 'wsSwPopupMode': '1', + 'wsSwitcherWraparound': 'false', + 'wsSwitcherIgnoreLast': 'false', + 'favoritesNotify': '0', + 'notificationPosition': '2', + 'osdPosition': '6', + 'hotCornerAction': '1', + 'hotCornerPosition': '1', + 'hotCornerFullscreen': 'true', + 'hotCornerRipples': 'true', + 'alwaysActivateSelectedWindow': 'false', + 'winPreviewSecBtnAction': '2', + 'winPreviewMidBtnAction': '1', + 'winPreviewShowCloseButton': 'true', + 'windowIconClickAction': '1', + 'overlayKeyPrimary': '1', + 'overlayKeySecondary': '1', + 'overviewEscBehavior': '0', + 'newWindowFocusFix': 'false', + 'newWindowMonitorFix': '0', + 'appGridPerformance': 'true', + 'highlightingStyle': '1', + + 'workspaceSwitcherPopupModule': 'true', + 'workspaceAnimationModule': 'true', + 'workspaceModule': 'true', + 'windowManagerModule': 'true', + 'windowPreviewModule': 'true', + 'windowAttentionHandlerModule': 'true', + 'swipeTrackerModule': 'true', + 'searchControllerModule': 'true', + 'searchModule': 'true', + 'panelModule': 'true', + 'overlayKeyModule': 'true', + 'osdWindowModule': 'true', + 'messageTrayModule': 'true', + 'layoutModule': 'true', + 'dashModule': 'true', + 'appFavoritesModule': 'true', + 'appDisplayModule': 'true' + }</default> </key> <key type="s" name="profile-name-4"> <default>""</default> </key> <key type="a{ss}" name="profile-data-4"> - <default>{'workspaceThumbnailsPosition': '6', 'wsMaxSpacing': '65', 'wsPreviewScale': '95', 'secWsPreviewScale': '100', 'secWsPreviewShift': 'false', 'wsThumbnailsFull': 'false', 'secWsThumbnailsPosition': '2', 'dashPosition': '2', 'dashPositionAdjust': '0', 'wsTmbPositionAdjust': '0', 'showWsTmbLabels': '3', 'showWsTmbLabelsOnHover': 'false', 'closeWsButtonMode': '2', 'secWsTmbPositionAdjust': '0', 'dashMaxIconSize': '48', 'dashShowWindowsIcon': '1', 'dashShowRecentFilesIcon': '1', 'dashShowExtensionsIcon': '1', 'centerDashToWs': 'false', 'showAppsIconPosition': '1', 'wsThumbnailScale': '10', 'wsThumbnailScaleAppGrid': '10', 'secWsThumbnailScale': '10', 'showSearchEntry': 'false', 'centerSearch': 'true', 'centerAppGrid': 'false', 'dashBgOpacity': '100', 'dashBgColor': '0', 'dashBgRadius': '0', 'dashBgGS3Style': 'false', 'runningDotStyle': '1', 'enablePageShortcuts': 'true', 'showWsSwitcherBg': 'true', 'showWsPreviewBg': 'true', 'wsPreviewBgRadius': '30', 'showBgInOverview': 'true', 'overviewBgBrightness': '60', 'searchBgBrightness': '30', 'overviewBgBlurSigma': '80', 'appGridBgBlurSigma': '80', 'smoothBlurTransitions': 'false', 'appGridAnimation': '4', 'searchViewAnimation': '4', 'workspaceAnimation': '1', 'animationSpeedFactor': '100', 'winPreviewIconSize': '1', 'winTitlePosition': '0', 'startupState': '2', 'overviewMode': '2', 'workspaceSwitcherAnimation': '1', 'searchIconSize': '96', 'searchViewScale': '104', 'appGridIconSize': '-1', 'appGridColumns': '0', 'appGridRows': '0', 'appGridFolderIconSize': '-1', 'appGridFolderColumns': '0', 'appGridFolderRows': '0', 'appGridFolderIconGrid': '3', 'appGridContent': '0', 'appGridIncompletePages': 'false', 'appGridOrder': '0', 'appFolderOrder': '0', 'appGridNamesMode': '1', 'appGridActivePreview': 'true', 'appGridFolderCenter': 'false', 'appGridPageWidthScale': '90', 'appGridSpacing': '5', 'searchWindowsOrder': '1', 'searchFuzzy': 'false', 'searchMaxResultsRows': '5', 'dashShowWindowsBeforeActivation': '1', 'dashIconScroll': '1', 'dashIsolateWorkspaces': 'false', 'searchWindowsIconScroll': '1', 'panelVisibility': '0', 'panelPosition': '0', 'windowAttentionMode': '0', 'wsSwPopupHPosition': '50', 'wsSwPopupVPosition': '95', 'wsSwPopupMode': '1', 'wsSwitcherWraparound': 'false', 'wsSwitcherIgnoreLast': 'false', 'favoritesNotify': '0', 'notificationPosition': '1', 'osdPosition': '6', 'hotCornerAction': '1', 'hotCornerPosition': '6', 'hotCornerFullscreen': 'true', 'hotCornerRipples': 'false', 'alwaysActivateSelectedWindow': 'false', 'winPreviewSecBtnAction': '2', 'winPreviewMidBtnAction': '1', 'winPreviewShowCloseButton': 'true', 'windowIconClickAction': '1', 'overlayKeyPrimary': '1', 'overlayKeySecondary': '1', 'overviewEscBehavior': '0', 'newWindowFocusFix': 'false', 'appGridPerformance': 'true', 'windowThumbnailScale': '20', 'workspaceSwitcherPopupModule': 'true', 'workspaceAnimationModule': 'true', 'workspaceModule': 'true', 'windowManagerModule': 'true', 'windowPreviewModule': 'true', 'windowAttentionHandlerModule': 'true', 'windowThumbnailModule': 'true', 'swipeTrackerModule': 'true', 'searchControllerModule': 'true', 'searchModule': 'true', 'panelModule': 'true', 'overlayKeyModule': 'true', 'osdWindowModule': 'true', 'messageTrayModule': 'true', 'layoutModule': 'true', 'dashModule': 'true', 'appFavoritesModule': 'true', 'appDisplayModule': 'true', 'windowSearchProviderModule': 'true', 'extensionsSearchProviderModule': 'true'}</default> + <default>{ + 'workspaceThumbnailsPosition': '6', + 'wsMaxSpacing': '65', + 'wsPreviewScale': '95', + 'secWsPreviewScale': '100', + 'secWsPreviewShift': 'false', + 'wsThumbnailsFull': 'false', + 'secWsThumbnailsPosition': '2', + 'dashPosition': '2', + 'dashPositionAdjust': '0', + 'wsTmbPositionAdjust': '0', + 'showWsTmbLabels': '3', + 'showWsTmbLabelsOnHover': 'false', + 'closeWsButtonMode': '2', + 'secWsTmbPositionAdjust': '0', + 'dashMaxIconSize': '48', + 'centerDashToWs': 'false', + 'showAppsIconPosition': '1', + 'wsThumbnailScale': '10', + 'wsThumbnailScaleAppGrid': '10', + 'secWsThumbnailScale': '10', + 'showSearchEntry': 'false', + 'centerSearch': 'true', + 'centerAppGrid': 'false', + 'dashBgOpacity': '100', + 'dashBgColor': '0', + 'dashBgRadius': '0', + 'dashBgGS3Style': 'false', + 'runningDotStyle': '1', + 'enablePageShortcuts': 'true', + 'showWsSwitcherBg': 'true', + 'showWsPreviewBg': 'true', + 'wsPreviewBgRadius': '30', + 'showBgInOverview': 'true', + 'overviewBgBrightness': '60', + 'searchBgBrightness': '30', + 'overviewBgBlurSigma': '80', + 'appGridBgBlurSigma': '80', + 'smoothBlurTransitions': 'false', + 'appGridAnimation': '4', + 'searchViewAnimation': '3', + 'workspaceAnimation': '1', + 'animationSpeedFactor': '100', + 'winPreviewIconSize': '1', + 'winTitlePosition': '0', + 'startupState': '2', + 'overviewMode': '2', + 'wsSwitcherMode': '0', + 'workspaceSwitcherAnimation': '1', + 'searchIconSize': '96', + 'searchViewScale': '104', + 'appGridIconSize': '-1', + 'appGridColumns': '0', + 'appGridRows': '0', + 'appGridFolderIconSize': '-1', + 'appGridFolderColumns': '0', + 'appGridFolderRows': '0', + 'appGridFolderIconGrid': '3', + 'appGridContent': '0', + 'appGridIncompletePages': 'false', + 'appGridOrder': '0', + 'appFolderOrder': '0', + 'appGridNamesMode': '1', + 'appGridActivePreview': 'true', + 'appGridFolderCenter': 'false', + 'appGridPageWidthScale': '90', + 'appGridSpacing': '5', + 'searchWindowsOrder': '1', + 'searchFuzzy': 'false', + 'searchMaxResultsRows': '5', + 'dashShowWindowsBeforeActivation': '1', + 'dashIconScroll': '1', + 'dashIsolateWorkspaces': 'false', + 'searchWindowsIconScroll': '1', + 'panelVisibility': '0', + 'panelPosition': '0', + 'windowAttentionMode': '0', + 'wsSwPopupHPosition': '50', + 'wsSwPopupVPosition': '95', + 'wsSwPopupMode': '1', + 'wsSwitcherWraparound': 'false', + 'wsSwitcherIgnoreLast': 'false', + 'favoritesNotify': '0', + 'notificationPosition': '1', + 'osdPosition': '6', + 'hotCornerAction': '1', + 'hotCornerPosition': '6', + 'hotCornerFullscreen': 'true', + 'hotCornerRipples': 'false', + 'alwaysActivateSelectedWindow': 'false', + 'winPreviewSecBtnAction': '2', + 'winPreviewMidBtnAction': '1', + 'winPreviewShowCloseButton': 'true', + 'windowIconClickAction': '1', + 'overlayKeyPrimary': '1', + 'overlayKeySecondary': '1', + 'overviewEscBehavior': '0', + 'newWindowFocusFix': 'false', + 'newWindowMonitorFix': '0', + 'appGridPerformance': 'true', + 'highlightingStyle': '1', + + 'workspaceSwitcherPopupModule': 'true', + 'workspaceAnimationModule': 'true', + 'workspaceModule': 'true', + 'windowManagerModule': 'true', + 'windowPreviewModule': 'true', + 'windowAttentionHandlerModule': 'true', + 'swipeTrackerModule': 'true', + 'searchControllerModule': 'true', + 'searchModule': 'true', + 'panelModule': 'true', + 'overlayKeyModule': 'true', + 'osdWindowModule': 'true', + 'messageTrayModule': 'true', + 'layoutModule': 'true', + 'dashModule': 'true', + 'appFavoritesModule': 'true', + 'appDisplayModule': 'true' + }</default> </key> </schema> diff --git a/extensions/45/vertical-workspaces/stylesheet.css b/extensions/45/vertical-workspaces/stylesheet.css index dca1d29..ef3b0ce 100644 --- a/extensions/45/vertical-workspaces/stylesheet.css +++ b/extensions/45/vertical-workspaces/stylesheet.css @@ -11,8 +11,8 @@ #dash.vertical .app-well-app, #dash.vertical .show-apps { - /* left/right padding exceeds dash bg by 6px to - cover spacing between dash and the edge of the screen + /* left/right padding exceeds dash bg by 6px + to cover the spacing between dash and the edge of the screen so the icons will be selectable even at the edge this spacing must be accounted for in overview allocate() */ padding-right: 16px; @@ -29,14 +29,14 @@ margin-left: 2px; margin-top: 4px; margin-bottom: 4px; - background-color: transparentize(#eeeeec, 0.7); } #dash.vertical .overview-icon { padding: 5px 0; } -#dash.vertical .app-well-app-running-dot { +#dash.vertical .app-well-app-running-dot, +#dash.vertical .app-grid-running-dot { margin: 4px 0px; } @@ -81,9 +81,10 @@ #dash.vertical-gs3-right .app-well-app, #dash.vertical-gs3-right .show-apps { /* left/right padding exceeds dash bg by 6px to - cover spacing between dash and the edge of the screen + cover spacing between dash icons and the edge of the screen so the icons will be selectable even at the edge this spacing must be accounted for in overview allocate() */ + padding: 0; padding-right: 9px; padding-left: 9px; } @@ -93,16 +94,7 @@ border-color: rgba(150, 150, 150, 0.4); } -.dash-background-reduced { - padding: 10px; -} - -.app-well-app-running-dot { - margin-bottom: 12px; -} - .app-well-app-running-dot-custom { - margin-bottom: 12px; width: 16px; height: 2px; } @@ -113,7 +105,7 @@ text-shadow: 1px 1px 3px rgba(33, 33, 33, 0.5); } -/* adjustment for the vertical ws switcher indicator popup*/ +/* adjustment for the vertical ws switcher indicator popup */ .ws-switcher-indicator { padding: 3px; margin: 5px; @@ -142,10 +134,10 @@ .ws-tmb-transparent { border: 0px; - background-color: rgba(200, 200, 200, 0.2); + background-color: rgba(200, 200, 200, 0.16); } -/* app grid page indicatos */ +/* app grid page indicators */ .page-indicator-icon { margin: 10px 10px 10px 10px; } @@ -154,33 +146,20 @@ padding: 0px; } -/* GS 43 App Grid - indicators that show up when dragging icon */ -.prevPageIndicator { - background: rgba(255, 255, 255, 0.1); - background-gradient-start: rgba(255, 255, 255, 0.1); - background-gradient-end: transparent; - background-gradient-direction: vertical; - border-radius: 100px 100px 0px 0px; -} -.nextPageIndicator { - background: rgba(255, 255, 255, 0.1); - background-gradient-start: transparent; - background-gradient-end: rgba(255, 255, 255, 0.1); - background-gradient-direction: vertical; - border-radius: 0px 0px 100px 100px; - -} -/* .search-entry{ background-color: rgba(200, 200, 200, 0.1); color: white; border-color: rgba(160, 160, 160, 0.4); } +.search-entry StLabel.hint-text { + color: rgba(200, 200, 200, 0.5); +} + .search-entry:hover, .search-entry:focus { background-color: rgba(200, 200, 200, 0.2); -}*/ +} .search-entry-om2 { color: white; @@ -208,6 +187,13 @@ background-color: rgba(200, 200, 200, 0.1); } +/* Reduce edge fading of search results scroll view */ +.vfade { -st-vfade-offset: 34px; } +.hfade { -st-hfade-offset: 34px; } +.search-section-content { + background-color: rgba(200, 200, 200, 0.1); +} + /* "no results" / "searching..." text*/ .search-statustext, .search-statustext-om2 { background-color: rgba(200, 200, 200, 0.1); @@ -279,9 +265,13 @@ StButton#vhandle { .osd-window { margin: 4em; + margin-bottom: 8em; /* avoid overlap with dock extension */ } -.app-folder .overview-icon, +.app-folder-46, +.app-folder-46 .overview-tile, +.app-folder-46 .overview-icon, +.app-folder-45 .overview-icon, .edit-folder-button, .folder-name-entry { background-color: rgba(200, 200, 200, 0.08); @@ -295,14 +285,130 @@ StButton#vhandle { border-color: rgba(160, 160, 160, 0.3); } -.edit-folder-button:hover, -.app-folder:hover .overview-icon, -.app-folder:focus .overview-icon { +.edit-folder-button:hover, +.app-folder-46:hover, +.app-folder-45:hover .overview-icon, +.app-folder-45:focus .overview-icon { background-color: rgba(200, 200, 200, 0.15); } -/* reduce quick menu buttons height in GS44 */ -/*.quick-toggle, -.quick-menu-toggle { - min-height: 42px; -}*/ +/* add missing spacing between buttons */ +.edit-folder-button-46 { + margin-right: 6px; +} + +/* 46 changes the default bg color from transparent to the solid color blending with widget background */ + .search-provider-icon, + .list-search-result, + .overview-tile { + background-color: transparent; + } + + /* Needed only for 46+, but doesn't hurt 45 */ + .search-provider-icon:hover, + .search-provider-icon:focus, + .search-provider-icon:selected, + .list-search-result:hover, + .list-search-result:focus, + .list-search-result:selected, + .overview-tile:hover, + .overview-tile:focus, + .overview-tile:selected, + .overview-icon:hover, + .overview-icon:focus, + .overview-icon:selected { + background-color: rgba(200, 200, 200, 0.15); + } + +.app-folder-46, +.app-folder-46 .overview-tile, +.app-folder-45 .overview-icon, /* 45 only */ +.edit-folder-button, +.folder-name-entry { + background-color: rgba(200, 200, 200, 0.08); +} + +.app-folder-46 .overview-icon, + #dash.dash-46 .overview-icon { + background-color: transparent; + } + + #dash.dash-46 .overview-tile, + #dash.dash-46 .show-apps { + background-color: transparent; + } + + #dash.dash-46 .overview-tile:hover .overview-icon, + #dash.dash-46 .overview-tile:focus .overview-icon, + #dash.dash-46 .overview-tile:selected .overview-icon, + #dash.dash-46 .show-apps:hover .overview-icon, + #dash.dash-46 .show-apps:focus .overview-icon, + #dash.dash-46 .show-apps:selected .overview-icon { + background-color: rgba(200, 200, 200, 0.15); + } + +#dash.vertical-46 { + margin: 0px; + padding: 0px; +} + +#dash.vertical-46-gs3-left { + margin-left: 0px; +} + +#dash.vertical-46-gs3-right { + margin-right: 0px; +} + +#dash.vertical-46 .overview-tile, +#dash.vertical-46 .show-apps { + margin: 0px; + background-color: transparent; + /* this padding should keep the dash 6px from the screen edge */ + padding: 0, 18px; +} + +#dash.vertical-46 .dash-separator { + height: 1px; + margin-right: 2px; + margin-left: 2px; + margin-top: 4px; + margin-bottom: 4px; +} + +#dash.vertical-46 .app-well-app-running-dot-custom { + margin: 0px; + width: 2px; + height: 16px; +} + +#dash.vertical-46 .dash-background { + padding: 12px; + margin: 0; +} + +#dash.vertical-46-gs3-left .overview-tile, +#dash.vertical-46-gs3-left .show-apps { + /* this padding should extend the icon tile to the edge of the dash background */ + padding: 0, 12px; +} + +#dash.vertical-46-gs3-right .overview-tile, +#dash.vertical-46-gs3-right .show-apps { + padding: 0, 12px; +} + +#dash.vertical-46-gs3-left .dash-background { + border-radius: 0 18px 18px 0; + border-left: 0px; +} + +#dash.vertical-46-gs3-right .dash-background { + border-radius: 18px 0 0 18px; + border-right: 0px; +} + +/* reverse padding */ +.ws-switcher-vertical { + padding: 18px 12px +}
\ No newline at end of file |