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

Merge branch 'master' of https://github.com/jderose9/dash-to-panel

Browse Source
This commit is contained in:
jderose9
2019-01-13 13:02:06 -05:00
parent d78ecd4317 6b78ada6cc
commit c0320324c4
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Settings.ui
View File

@@ -85,11 +85,12 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
<item id="RAISE" translatable="yes">Raise window</item>
<item id="RAISE" translatable="yes">Raise windows</item>
<item id="MINIMIZE" translatable="yes">Minimize window</item>
<item id="LAUNCH" translatable="yes">Launch new instance</item>
<item id="CYCLE" translatable="yes">Cycle through windows</item>
<item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
<item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
<item id="QUIT" translatable="yes">Quit</item>
</items>
</object>
@@ -155,11 +156,12 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
<item id="RAISE" translatable="yes">Raise window</item>
<item id="RAISE" translatable="yes">Raise windows</item>
<item id="MINIMIZE" translatable="yes">Minimize window</item>
<item id="LAUNCH" translatable="yes">Launch new instance</item>
<item id="CYCLE" translatable="yes">Cycle through windows</item>
<item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
<item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
<item id="QUIT" translatable="yes">Quit</item>
</items>
</object>
@@ -225,11 +227,12 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
<item id="RAISE" translatable="yes">Raise window</item>
<item id="RAISE" translatable="yes">Raise windows</item>
<item id="MINIMIZE" translatable="yes">Minimize window</item>
<item id="LAUNCH" translatable="yes">Launch new instance</item>
<item id="CYCLE" translatable="yes">Cycle through windows</item>
<item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
<item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
<item id="QUIT" translatable="yes">Quit</item>
</items>
</object>
@@ -5423,11 +5426,12 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<items>
<item id="RAISE" translatable="yes">Raise window</item>
<item id="MINIMIZE" translatable="yes">Minimize window</item>
<item id="LAUNCH" translatable="yes">Launch new instance</item>
<item id="CYCLE" translatable="yes">Cycle through windows</item>
<item id="CYCLE-MIN" translatable="yes">Cycle windows + minimize</item>
<item id="CYCLE" translatable="yes">Cycle through windows</item>
<item id="TOGGLE-SHOWPREVIEW" translatable="yes">Toggle single / Preview multiple</item>
<item id="MINIMIZE" translatable="yes">Toggle windows</item>
<item id="RAISE" translatable="yes">Raise windows</item>
<item id="LAUNCH" translatable="yes">Launch new instance</item>
</items>
</object>
<packing>

38
appIcons.js
View File

@@ -717,9 +717,6 @@ var taskbarAppIcon = new Lang.Class({
},
activate: function(button, handleAsGrouped) {
if (this.windowPreview)
this.windowPreview.requestCloseMenu();
let event = Clutter.get_current_event();
let modifiers = event ? event.get_state() : 0;
let focusedApp = tracker.focus_app;
@@ -753,21 +750,24 @@ var taskbarAppIcon = new Lang.Class({
else
buttonAction = this._dtpSettings.get_string('click-action');
}
let appCount = this.getAppIconInterestingWindows().length;
if (this.windowPreview && (!(buttonAction == "TOGGLE-SHOWPREVIEW") || (appCount <= 1)))
this.windowPreview.requestCloseMenu();
// We check if the app is running, and that the # of windows is > 0 in
// case we use workspace isolation,
let appIsRunning = this.app.state == Shell.AppState.RUNNING
&& this.getAppIconInterestingWindows().length > 0
let appIsRunning = this.app.state == Shell.AppState.RUNNING && appCount > 0;
// We customize the action only when the application is already running
if (appIsRunning && !this.isLauncher) {
if (this.window && !handleAsGrouped) {
//ungrouped applications behaviors
switch (buttonAction) {
case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE':
case 'RAISE': case 'CYCLE': case 'CYCLE-MIN': case 'MINIMIZE': case 'TOGGLE-SHOWPREVIEW':
if (!Main.overview._shown &&
(buttonAction == 'MINIMIZE' ||
(buttonAction == 'CYCLE-MIN' && this._isFocusedWindow()))) {
(buttonAction == 'MINIMIZE' || buttonAction == 'TOGGLE-SHOWPREVIEW' || buttonAction == 'CYCLE-MIN') &&
(this._isFocusedWindow() || (buttonAction == 'MINIMIZE' && (button == 2 || modifiers & Clutter.ModifierType.SHIFT_MASK)))) {
this.window.minimize();
} else {
Main.activateWindow(this.window);
@@ -839,6 +839,26 @@ var taskbarAppIcon = new Lang.Class({
else
this.app.activate();
break;
case "TOGGLE-SHOWPREVIEW":
if (!Main.overview._shown) {
if (appCount == 1) {
if (this.app == focusedApp)
minimizeWindow(this.app, false, this._dtpSettings);
else
activateFirstWindow(this.app, this._dtpSettings);
} else {
// minimize all windows if double clicked
if (Clutter.EventType.CLUTTER_BUTTON_PRESS) {
let click_count = event.get_click_count();
if(click_count > 1) {
minimizeWindow(this.app, true, this._dtpSettings);
}
}
}
}
else
this.app.activate();
break;
case "QUIT":
closeAllWindows(this.app, this._dtpSettings);

1
schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml
View File

@@ -16,6 +16,7 @@
<value value='3' nick='CYCLE'/>
<value value='4' nick='CYCLE-MIN'/>
<value value='5' nick='QUIT'/>
<value value='6' nick='TOGGLE-SHOWPREVIEW'/>
</enum>
<enum id='org.gnome.shell.extensions.dash-to-panel.statusAreaPosition'>
<value value='0' nick='BUTTONSLEFT'/>