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

Remove setBarrierSize override

Browse Source
This commit is contained in:
Charles Gagnon
2019-10-05 23:50:38 -04:00
parent 381bedcb9b
commit 2a43b2e625
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
panelManager.js
View File

@@ -129,10 +129,6 @@ var dtpPanelManager = Utils.defineClass({
this._oldUpdateHotCorners = Main.layoutManager._updateHotCorners;
Main.layoutManager._updateHotCorners = Lang.bind(Main.layoutManager, newUpdateHotCorners);
Layout.HotCorner.prototype._oldSetBarrierSize = Layout.HotCorner.prototype.setBarrierSize;
Layout.HotCorner.prototype.setBarrierSize = newSetBarrierSize;
Main.layoutManager._updateHotCorners();
if (Main.layoutManager._interfaceSettings) {
@@ -235,9 +231,6 @@ var dtpPanelManager = Utils.defineClass({
this._signalsHandler.destroy();
Layout.HotCorner.prototype.setBarrierSize = Layout.HotCorner.prototype._oldSetBarrierSize;
delete Layout.HotCorner.prototype._oldSetBarrierSize;
Main.layoutManager._updateHotCorners = this._oldUpdateHotCorners;
Main.layoutManager._updateHotCorners();
@@ -506,14 +499,13 @@ function newUpdateHotCorners() {
this.hotCorners = [];
//global.settings is ubuntu specific setting to disable the hot corner (Tweak tool > Top Bar > Activities Overview Hot Corner)
//Main.layoutManager._interfaceSettings is for the setting to disable the hot corner introduced in gnome-shell 3.34
//this._interfaceSettings is for the setting to disable the hot corner introduced in gnome-shell 3.34
if ((global.settings.list_keys().indexOf('enable-hot-corners') >= 0 && !global.settings.get_boolean('enable-hot-corners')) ||
(Main.layoutManager._interfaceSettings && !Main.layoutManager._interfaceSettings.get_boolean('enable-hot-corners'))) {
(this._interfaceSettings && !this._interfaceSettings.get_boolean('enable-hot-corners'))) {
this.emit('hot-corners-changed');
return;
}
let size = this.panelBox.height;
let panelPosition = Panel.getPosition();
// build new hot corners
@@ -559,7 +551,7 @@ function newUpdateHotCorners() {
if (haveTopLeftCorner) {
let corner = new Layout.HotCorner(this, monitor, cornerX, cornerY);
corner.setBarrierSize(size);
corner.setBarrierSize(Panel.size);
this.hotCorners.push(corner);
} else {
this.hotCorners.push(null);
@@ -569,13 +561,6 @@ function newUpdateHotCorners() {
this.emit('hot-corners-changed');
}
function newSetBarrierSize(size) {
//the hotcorner sizes are re-applied when the panelbox allocation changes and
//the used size is the panelbox height. To prevent giant barriers when the panelbox
//is vertical, set a max size here
this._oldSetBarrierSize(Panel.size);
}
function newUpdatePanelBarrier(panel) {
if (this._rightPanelBarrier) {
this._rightPanelBarrier.destroy();