Skip to content

Commit

Permalink
Code cleanup in enable() and disable()
Browse files Browse the repository at this point in the history
The current enable() and disable() methods in the panelManager
class do receive a 'reset' parameter to allow to "reset" and
recreate the panels without disconnecting and connecting again
signals and doing the whole disable-and-enable process.

This MR moves the common part into their own functions, and
thus removing the parameter and making the code simpler.
  • Loading branch information
Sergio Costas committed Jan 22, 2022
1 parent 17f6fdf commit c2d4302
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions panelManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ var dtpPanelManager = Utils.defineClass({
});
},

enable: function(reset) {
_createPanels() {
let dtpPrimaryIndex = Me.settings.get_int('primary-monitor');

this.dtpPrimaryMonitor = Main.layoutManager.monitors[dtpPrimaryIndex] || Main.layoutManager.primaryMonitor;
Expand All @@ -83,7 +83,7 @@ var dtpPanelManager = Utils.defineClass({

this.primaryPanel = this._createPanel(this.dtpPrimaryMonitor, Me.settings.get_boolean('stockgs-keep-top-panel'));
this.allPanels = [ this.primaryPanel ];

this.overview.enable(this.primaryPanel);

if (Me.settings.get_boolean('multi-monitors')) {
Expand All @@ -98,14 +98,14 @@ var dtpPanelManager = Utils.defineClass({
this.allPanels.forEach(p => {
let panelPosition = p.getPosition();
let leftOrRight = (panelPosition == St.Side.LEFT || panelPosition == St.Side.RIGHT);

p.panelBox.set_size(
leftOrRight ? -1 : p.geom.w + p.geom.lrPadding,
leftOrRight ? -1 : p.geom.w + p.geom.lrPadding,
leftOrRight ? p.geom.h + p.geom.tbPadding : -1
);

this._findPanelMenuButtons(p.panelBox).forEach(pmb => this._adjustPanelMenuButton(pmb, p.monitor, panelPosition));

p.taskbar.iconAnimator.start();
});

Expand All @@ -115,7 +115,7 @@ var dtpPanelManager = Utils.defineClass({

Utils.hookVfunc(BoxPointer.BoxPointer.prototype, 'get_preferred_height', function(forWidth) {
let alloc = { min_size: 0, natural_size: 0 };

[alloc.min_size, alloc.natural_size] = this.vfunc_get_preferred_height(forWidth);

return panelManager._getBoxPointerPreferredHeight(this, alloc);
Expand All @@ -124,12 +124,14 @@ var dtpPanelManager = Utils.defineClass({

this._updatePanelElementPositions();
this.setFocusedMonitor(this.dtpPrimaryMonitor);

if (this.primaryPanel.checkIfVertical()) {
Main.wm._getPositionForDirection = newGetPositionForDirection;
}

if (reset) return;
},

enable: function() {
this._createPanels();

if (Config.PACKAGE_VERSION > '3.35.1') {
this._oldDoSpringAnimation = AppDisplay.BaseAppView.prototype._doSpringAnimation;
Expand Down Expand Up @@ -265,7 +267,7 @@ var dtpPanelManager = Utils.defineClass({
Object.defineProperty(Main.panel, "style", {configurable: true, set: function(v) {}});
},

disable: function(reset) {
_destroyPanels() {
this.overview.disable();
this.proximityManager.destroy();

Expand Down Expand Up @@ -315,9 +317,12 @@ var dtpPanelManager = Utils.defineClass({
Main.layoutManager.panelBox.set_position(Main.layoutManager.primaryMonitor.x, Main.layoutManager.primaryMonitor.y);
Main.layoutManager.panelBox.set_size(Main.layoutManager.primaryMonitor.width, -1);
}
},

disable: function() {

this._destroyPanels();

if (reset) return;

this._setKeyBindings(false);

this._signalsHandler.destroy();
Expand Down Expand Up @@ -414,9 +419,9 @@ var dtpPanelManager = Utils.defineClass({
},

_reset: function() {
this.disable(true);
this._destroyPanels();
this.allPanels = [];
this.enable(true);
this._createPanels();
},

_updatePanelElementPositions: function() {
Expand Down

0 comments on commit c2d4302

Please sign in to comment.