Override style setter for main panel to keep GS from blowing away styles #1333

This commit is contained in:
Jason DeRose
2021-06-18 22:47:30 -04:00
parent 67b1978785
commit 35081df201
2 changed files with 7 additions and 26 deletions

View File

@@ -83,7 +83,6 @@ var dtpOverview = Utils.defineClass({
Utils.hookVfunc(Workspace.WorkspaceBackground.prototype, 'allocate', Workspace.WorkspaceBackground.prototype.vfunc_allocate);
Utils.hookVfunc(OverviewControls.ControlsManagerLayout.prototype, 'allocate', OverviewControls.ControlsManagerLayout.prototype.vfunc_allocate);
OverviewControls.ControlsManagerLayout.prototype._computeWorkspacesBoxForState = this._oldComputeWorkspacesBoxForState;
Main.overview._hideDone = this._oldHideDone;
this._signalsHandler.destroy();
this._injectionsHandler.destroy();
@@ -691,30 +690,6 @@ var dtpOverview = Utils.defineClass({
contentBox.set_size(xOff + contentWidth, yOff + contentHeight);
this._backgroundGroup.allocate(contentBox);
});
this._oldHideDone = Main.overview._hideDone;
Main.overview._hideDone = function() {
// Re-enable unredirection
Meta.enable_unredirect_for_display(global.display);
this._desktopFade.hide();
this._coverPane.hide();
this._visible = false;
this._animationInProgress = false;
this.emit('hidden');
// Handle any calls to show* while we were hiding
if (this._shown)
this._animateVisible(OverviewControls.ControlsState.WINDOW_PICKER);
else
Main.layoutManager.hideOverview();
if (Me.settings.get_boolean('stockgs-keep-top-panel')) {
Main.panel.style = null;
}
this._syncGrab();
}
}
});
});

View File

@@ -259,6 +259,10 @@ var dtpPanelManager = Utils.defineClass({
));
this._setKeyBindings(true);
// keep GS overview.js from blowing away custom panel styles
if(!Me.settings.get_boolean('stockgs-keep-top-panel'))
Object.defineProperty(Main.panel, "style", {set: function(v) {}});
},
disable: function(reset) {
@@ -345,6 +349,8 @@ var dtpPanelManager = Utils.defineClass({
LookingGlass.LookingGlass.prototype.open = LookingGlass.LookingGlass.prototype._oldOpen;
delete LookingGlass.LookingGlass.prototype._oldOpen
delete Main.panel.style;
},
setFocusedMonitor: function(monitor, ignoreRelayout) {