morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-15 00:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add window peek

Browse Source
This commit is contained in:
Charles Gagnon
2019-05-21 14:31:55 -04:00
parent 29b3459a76
commit 1d1a5ce85a
3 changed files with 107 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appIcons.js
View File

@@ -541,12 +541,7 @@ var taskbarAppIcon = Utils.defineClass({
},
_onSwitchWorkspace: function(windowTracker) {
this._previewMenu.close();
Mainloop.timeout_add(0, Lang.bind(this, function () {
this._displayProperIndicator();
return GLib.SOURCE_REMOVE;
}));
this._displayProperIndicator();
},
_displayProperIndicator: function (force) {

5
overview.js
View File

@@ -186,9 +186,12 @@ var dtpOverview = Utils.defineClass({
if (this._dtpSettings.get_boolean('shortcut-previews') && windowCount > 1) {
if (this._currentHotkeyFocusIndex < 0) {
let currentWindow = appIcon.window;
let keyFocusOutId = appIcon.actor.connect('key-focus-out', () => appIcon.actor.grab_key_focus());
let capturedEventId = global.stage.connect('captured-event', (actor, e) => {
if (e.type() == Clutter.EventType.KEY_RELEASE && e.get_key_symbol() == Clutter.Super_L) {
global.stage.disconnect(capturedEventId);
appIcon.actor.disconnect(keyFocusOutId);
appIcon._previewMenu.activateFocused();
appIcon.window = currentWindow;
delete appIcon._hotkeysCycle;
@@ -201,7 +204,7 @@ var dtpOverview = Utils.defineClass({
appIcon._hotkeysCycle = appIcon.window;
appIcon.window = null;
appIcon._previewMenu.open(appIcon);
global.stage.set_key_focus(appIcon.actor);
appIcon.actor.grab_key_focus();
}
this._currentHotkeyFocusIndex = appIcon._previewMenu.focusNext();

113
windowPreview.js
View File

@@ -30,17 +30,17 @@ const Me = imports.misc.extensionUtils.getCurrentExtension();
const Taskbar = Me.imports.taskbar;
const Utils = Me.imports.utils;
//timeout intervals
//timeout names
const T1 = 'openMenuTimeout';
const T2 = 'closeMenuTimeout';
const T3 = 'enterPeekTimeout';
const MAX_TRANSLATION = 40;
const HEADER_HEIGHT = 38;
const DEFAULT_RATIO = { w: 160, h: 90 };
const FOCUSED_COLOR_OFFSET = 24;
const HEADER_COLOR_OFFSET = -12;
const WORKSPACE_SWITCH_TIME = 120;
var headerHeight = 0;
var isLeftButtons = false;
@@ -57,6 +57,8 @@ var PreviewMenu = Utils.defineClass({
this._panelWrapper = panelWrapper;
this.currentAppIcon = null;
this._focusedPreview = null;
this._peekedWorkspace = null;
this._peekInitialWorkspace = null;
this.opened = false;
this._position = Taskbar.getPosition();
let isLeftOrRight = this._checkIfLeftOrRight();
@@ -91,7 +93,7 @@ var PreviewMenu = Utils.defineClass({
// move closing delay setting from "advanced"
// hook settings (animation time, size, label color)
// hook settings (animation time, size, label color, header location)
},
enable: function() {
@@ -175,15 +177,17 @@ var PreviewMenu = Utils.defineClass({
},
close: function(immediate) {
this.currentAppIcon = null;
this.removeFocus();
this._endOpenCloseTimeouts();
this._removeFocus();
this._endPeek();
if (immediate) {
this._resetHiddenState();
} else {
this._animateOpenOrClose(false, () => this._resetHiddenState());
}
this.currentAppIcon = null;
},
update: function(appIcon, windows) {
@@ -204,9 +208,11 @@ var PreviewMenu = Utils.defineClass({
nextIndex = previews[nextIndex] ? nextIndex : 0;
this.removeFocus();
previews[nextIndex].setFocus(true);
this._focusedPreview = previews[nextIndex];
if (previews[nextIndex]) {
this._removeFocus();
previews[nextIndex].setFocus(true);
this._focusedPreview = previews[nextIndex];
}
return nextIndex;
},
@@ -217,7 +223,23 @@ var PreviewMenu = Utils.defineClass({
}
},
removeFocus: function() {
requestPeek(window) {
this._timeoutsHandler.remove(T3);
if (this._dtpSettings.get_boolean('peek-mode')) {
if (!this._peekInitialWorkspace) {
this._timeoutsHandler.add([T3, this._dtpSettings.get_int('enter-peek-mode-timeout'), () => this._peek(window)]);
} else {
this._peek(window);
}
}
},
endPeekHere: function() {
this._endPeek(true);
},
_removeFocus: function() {
if (this._focusedPreview) {
this._focusedPreview.setFocus(false);
this._focusedPreview = null;
@@ -427,7 +449,71 @@ var PreviewMenu = Utils.defineClass({
_checkIfLeftOrRight: function() {
return this._position == St.Side.LEFT || this._position == St.Side.RIGHT;
}
},
_peek: function(window) {
let currentWorkspace = this._getCurrentWorkspace();
let windowWorkspace = window.get_workspace();
let needsWorspaceChange = currentWorkspace != windowWorkspace;
this._timeoutsHandler.remove(T3);
if (this._peekedWorkspace) {
if (needsWorspaceChange) {
this._timeoutsHandler.add([T3, WORKSPACE_SWITCH_TIME, () => this._changeWorkspaceWindows(currentWorkspace, 255, true)]);
} else {
this._changeWorkspaceWindows(this._peekedWorkspace, 255, false);
}
}
this._changeWorkspaceWindows(windowWorkspace, 0, needsWorspaceChange, window);
this._peekedWorkspace = windowWorkspace;
if (needsWorspaceChange) {
this._switchToWorkspace(windowWorkspace);
}
if (!this._peekInitialWorkspace) {
this._peekInitialWorkspace = currentWorkspace;
}
},
_endPeek: function(stayHere) {
this._timeoutsHandler.remove(T3);
if (this._peekedWorkspace) {
this._changeWorkspaceWindows(this._peekedWorkspace, 255, this._peekedWorkspace != this._peekInitialWorkspace);
if (!stayHere) {
this._switchToWorkspace(this._peekInitialWorkspace);
}
}
this._peekedWorkspace = null;
this._peekInitialWorkspace = null;
},
_changeWorkspaceWindows: function(workspace, opacity, immediate, ignoredWindow) {
workspace.list_windows()
.filter(mw => !mw.minimized && !mw.is_on_all_workspaces() && mw != ignoredWindow)
.forEach(mw => {
let windowActor = mw.get_compositor_private();
if (immediate) {
windowActor.opacity = opacity;
} else {
Tweener.addTween(windowActor, getTweenOpts({ opacity: opacity }));
}
});
},
_getCurrentWorkspace: function() {
return Utils.DisplayWrapper.getWorkspaceManager().get_active_workspace();
},
_switchToWorkspace: function(workspace) {
workspace.activate(1);
},
});
var Preview = Utils.defineClass({
@@ -551,11 +637,16 @@ var Preview = Utils.defineClass({
setFocus: function(focused) {
this._hideOrShowCloseButton(!focused);
this.set_style(this._getBackgroundColor(FOCUSED_COLOR_OFFSET, focused ? '-' : 0));
if (focused) {
this._previewMenu.requestPeek(this.window);
}
},
activate: function() {
Main.activateWindow(this.window);
this._hideOrShowCloseButton(true);
this._previewMenu.endPeekHere();
this._previewMenu.close();
},
@@ -623,7 +714,7 @@ var Preview = Utils.defineClass({
let workspaceStyle = null;
if (!this._previewMenu._dtpSettings.get_boolean('isolate-workspaces')) {
workspaceIndex = this.window.get_workspace().index().toString();
workspaceIndex = (this.window.get_workspace().index() + 1).toString();
workspaceStyle = 'padding: 0 4px; border: 2px solid ' + this._getRgbaColor(FOCUSED_COLOR_OFFSET, .8) +
'border-radius: 2px; margin-right: 4px;';
}