From 08a46105fcbbb0f45cb16e00f8166ba64d4c6aaf Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Sat, 2 May 2020 19:10:57 -0400 Subject: [PATCH] Adjust flat-remix when keeping stock gnome-shell top panel --- panel.js | 7 +++++-- panelManager.js | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/panel.js b/panel.js index 98416db..cecf6fa 100644 --- a/panel.js +++ b/panel.js @@ -662,7 +662,8 @@ var dtpPanel = Utils.defineClass({ let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor || 1; let panelBoxTheme = this.panelBox.get_theme_node(); let lrPadding = panelBoxTheme.get_padding(St.Side.RIGHT) + panelBoxTheme.get_padding(St.Side.LEFT); - let tbPadding = panelBoxTheme.get_padding(St.Side.TOP) + panelBoxTheme.get_padding(St.Side.BOTTOM); + let topPadding = panelBoxTheme.get_padding(St.Side.TOP); + let tbPadding = topPadding + panelBoxTheme.get_padding(St.Side.BOTTOM); let position = getPosition(); let gsTopPanelOffset = 0; let x = 0, y = 0; @@ -671,7 +672,7 @@ var dtpPanel = Utils.defineClass({ size = Me.settings.get_int('panel-size') * scaleFactor; if (Me.settings.get_boolean('stockgs-keep-top-panel') && Main.layoutManager.primaryMonitor == this.monitor) { - gsTopPanelOffset = Main.layoutManager.panelBox.height; + gsTopPanelOffset = Main.layoutManager.panelBox.height - topPadding; } if (checkIfVertical()) { @@ -709,6 +710,8 @@ var dtpPanel = Utils.defineClass({ return { x: x, y: y, w: w, h: h, + lrPadding: lrPadding, + tbPadding: tbPadding, position: position }; }, diff --git a/panelManager.js b/panelManager.js index ee8dea8..06553c3 100755 --- a/panelManager.js +++ b/panelManager.js @@ -95,8 +95,8 @@ var dtpPanelManager = Utils.defineClass({ let leftOrRight = (panelPosition == St.Side.LEFT || panelPosition == St.Side.RIGHT); p.panelBox.set_size( - leftOrRight ? -1 : p.geom.w, - leftOrRight ? p.geom.h : -1 + 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));