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

Merge branch 'hoverfix' into dev

Browse Source
This commit is contained in:
jderose9
2017-01-23 17:31:55 -05:00
parent 8a188bc09d 966ebdc74a
commit 3a346513fa
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
taskbar.js
View File

@@ -521,6 +521,33 @@ const taskbar = new Lang.Class({
}
}));
appIcon.windowPreview.connect('menu-closed', Lang.bind(this, function(menu) {
let appIcons = this._getAppIcons();
// enter-event doesn't fire on an app icon when the popup menu from a previously
// hovered app icon is still open, so when a preview menu closes we need to
// see if a new app icon is hovered and open its preview menu now.
// also, for some reason actor doesn't report being hovered by get_hover()
// if the hover started when a popup was opened. So, look for the actor by mouse position.
let [x, y,] = global.get_pointer();
let hoveredActor = global.stage.get_actor_at_pos(Clutter.PickMode.REACTIVE, x, y);
let appIconToOpen;
appIcons.forEach(function (appIcon) {
if(appIcon.actor == hoveredActor) {
appIconToOpen = appIcon;
} else if(appIcon.windowPreview && appIcon.windowPreview.isOpen) {
appIcon.windowPreview.close();
}
});
if(appIconToOpen) {
appIconToOpen.actor.sync_hover();
if(appIconToOpen.windowPreview && appIconToOpen.windowPreview != menu)
appIconToOpen.windowPreview._onEnter();
}
return GLib.SOURCE_REMOVE;
}));
appIcon.actor.connect('clicked',
Lang.bind(this, function(actor) {
ensureActorVisibleInScrollView(this._scrollView, actor);
@@ -1201,12 +1228,12 @@ const taskbarAppIcon = new Lang.Class({
// function) caused the extension to crash.
this._menuManagerWindowPreview = new PopupMenu.PopupMenuManager(this);
this._windowPreview = new WindowPreview.thumbnailPreviewMenu(this, this._dtpSettings);
this._windowPreview.connect('open-state-changed', Lang.bind(this, function (menu, isPoppedUp) {
this.windowPreview = new WindowPreview.thumbnailPreviewMenu(this, this._dtpSettings);
this.windowPreview.connect('open-state-changed', Lang.bind(this, function (menu, isPoppedUp) {
if (!isPoppedUp)
this._onMenuPoppedDown();
}));
this._menuManagerWindowPreview.addMenu(this._windowPreview);
this._menuManagerWindowPreview.addMenu(this.windowPreview);
this.forcedOverview = false;
},
@@ -1216,7 +1243,7 @@ const taskbarAppIcon = new Lang.Class({
getInterestingWindows(this.app, this._dtpSettings).length > 0) {
return false;
} else {
return this.actor.hover && (!this._menu || !this._menu.isOpen) && (!this._windowPreview || !this._windowPreview.isOpen);
return this.actor.hover && (!this._menu || !this._menu.isOpen) && (!this.windowPreview || !this.windowPreview.isOpen);
}
},
@@ -1318,8 +1345,8 @@ const taskbarAppIcon = new Lang.Class({
this.emit('menu-state-changed', true);
this._windowPreview.shouldOpen = false;
this._windowPreview.close();
this.windowPreview.shouldOpen = false;
this.windowPreview.close();
this.actor.set_hover(true);
this._menu.actor.add_style_class_name('dashtopanelSecondaryMenu');
@@ -1363,8 +1390,8 @@ const taskbarAppIcon = new Lang.Class({
},
activate: function(button) {
this._windowPreview.shouldOpen = false;
this._windowPreview.requestCloseMenu();
this.windowPreview.shouldOpen = false;
this.windowPreview.requestCloseMenu();
let event = Clutter.get_current_event();
let modifiers = event ? event.get_state() : 0;

4
windowPreview.js
View File

@@ -130,7 +130,7 @@ const thumbnailPreviewMenu = new Lang.Class({
this.shouldClose = true;
this.shouldOpen = false;
Mainloop.timeout_add(0, Lang.bind(this, this.hoverClose));
Mainloop.timeout_add(100, Lang.bind(this, this.hoverClose));
},
hoverOpen: function () {
@@ -173,7 +173,7 @@ const thumbnailPreviewMenu = new Lang.Class({
if (this._boxPointer.actor.visible) {
this._boxPointer.hide(animate, Lang.bind(this, function() {
this.emit('menu-closed');
this.emit('menu-closed', this);
}));
}