Adjust panel margins for all positions and gs top panel

schemas/org.gnome.shell.extensions.dash-to-panel.gschema.xml

@@ -252,6 +252,14 @@
     <key type="i" name="panel-side-margins">
         <default>0</default>
         <summary>Panel side margins</summary>
+    </key>
+      <key type="i" name="panel-top-bottom-padding">
+        <default>0</default>
+        <summary>Panel top and bottom padding</summary>
+    </key>
+    <key type="i" name="panel-sides-padding">
+        <default>0</default>
+        <summary>Panel sides padding</summary>
     </key>
     <key type="b" name="trans-use-custom-bg">
       <default>false</default>

src/panel.js

@@ -382,6 +382,9 @@ export const Panel = GObject.registerClass(
       this.taskbar.destroy()
       this.showAppsIconWrapper.destroy()
 
+      this._setPanelBoxStyle('0', '0')
+      this._maybeSetDockCss(true)
+
       this.menuManager._changeMenu = this.menuManager._oldChangeMenu
 
       this._unmappedButtons.forEach((a) => this._disconnectVisibleId(a))
@@ -700,6 +703,7 @@ export const Panel = GObject.registerClass(
     }
 
     getGeometry() {
+      let isVertical = this.checkIfVertical()
       let scaleFactor = Utils.getScaleFactor()
       let panelBoxTheme = this.panelBox.get_theme_node()
       let leftPadding = panelBoxTheme.get_padding(St.Side.LEFT)
@@ -715,7 +719,6 @@ export const Panel = GObject.registerClass(
       let dynamic = panelLength == -1 ? Pos.anchorToPosition[anchor] : 0
       let dockMode = false
       let length = (dynamic ? 100 : panelLength) / 100
-      let anchorPlaceOnMonitor = 0
       let gsTopPanelOffset = 0
       let x = 0,
         y = 0
@@ -729,10 +732,10 @@ export const Panel = GObject.registerClass(
         SETTINGS.get_boolean('stockgs-keep-top-panel') &&
         Main.layoutManager.primaryMonitor == this.monitor
       ) {
-        gsTopPanelOffset = Main.layoutManager.panelBox.height - topPadding
+        gsTopPanelOffset = Main.layoutManager.panelBox.height
       }
 
-      if (this.checkIfVertical()) {
+      if (isVertical) {
         if (!SETTINGS.get_boolean('group-apps')) {
           // add window title width and side padding of _dtpIconContainer when vertical
           this.dtpSize +=
@@ -746,7 +749,7 @@ export const Panel = GObject.registerClass(
 
         w = this.dtpSize
         h = this.monitor.height * length - tbPadding - gsTopPanelOffset
-        dockMode = h < this.monitor.height
+        dockMode = !!dynamic || tbPadding > 0 || h < this.monitor.height
       } else {
         this.sizeFunc = 'get_preferred_width'
         this.fixedCoord = { c1: 'y1', c2: 'y2' }
@@ -754,43 +757,31 @@ export const Panel = GObject.registerClass(
 
         w = this.monitor.width * length - lrPadding
         h = this.dtpSize
-        dockMode = w < this.monitor.width
+        dockMode = !!dynamic || lrPadding > 0 || w < this.monitor.width
       }
 
       if (position == St.Side.TOP || position == St.Side.LEFT) {
         x = this.monitor.x
         y = this.monitor.y + gsTopPanelOffset
       } else if (position == St.Side.RIGHT) {
-        x = this.monitor.x + this.monitor.width - this.dtpSize - lrPadding
+        x = this.monitor.x + this.monitor.width - w - lrPadding
         y = this.monitor.y + gsTopPanelOffset
       } else {
         //BOTTOM
-        x = this.monitor.x - leftPadding
+        x = this.monitor.x
-        y = this.monitor.y + this.monitor.height - this.dtpSize - tbPadding
+        y = this.monitor.y + this.monitor.height - h - tbPadding
       }
 
-      if (this.checkIfVertical()) {
+      if (length < 1) {
-        let viewHeight = this.monitor.height - gsTopPanelOffset
+        // fixed size, less than 100%, so adjust start coordinate
-
+        if (!isVertical && anchor == Pos.MIDDLE)
-        if (anchor === Pos.MIDDLE) {
+          x += (this.monitor.width - w - lrPadding) * 0.5
-          anchorPlaceOnMonitor = (viewHeight - h) / 2
+        else if (isVertical && anchor == Pos.MIDDLE)
-        } else if (anchor === Pos.END) {
+          y += (this.monitor.height - h - tbPadding) * 0.5
-          anchorPlaceOnMonitor = viewHeight - h
+        else if (!isVertical && anchor == Pos.END)
-        } else {
+          x += this.monitor.width - w - lrPadding
-          // Pos.START
+        else if (isVertical && anchor == Pos.END)
-          anchorPlaceOnMonitor = 0
+          y += this.monitor.height - h - tbPadding
-        }
-        y = y + anchorPlaceOnMonitor
-      } else {
-        if (anchor === Pos.MIDDLE) {
-          anchorPlaceOnMonitor = (this.monitor.width - w) / 2
-        } else if (anchor === Pos.END) {
-          anchorPlaceOnMonitor = this.monitor.width - w
-        } else {
-          // Pos.START
-          anchorPlaceOnMonitor = 0
-        }
-        x = x + anchorPlaceOnMonitor
       }
 
       return {
@@ -966,8 +957,8 @@ export const Panel = GObject.registerClass(
 
       if (this.geom.dynamic && this._elementGroups.length == 1) {
         let dynamicGroup = this._elementGroups[0] // only one group if dynamic
-        let tl = 0
+        let tl = box[this.varCoord.c1]
-        let br = 0
+        let br = box[this.varCoord.c2]
 
         if (this.geom.dynamic == Pos.STACKED_TL) {
           br = Math.min(box[this.varCoord.c2], dynamicGroup.size)
@@ -978,7 +969,10 @@ export const Panel = GObject.registerClass(
           // CENTERED_MONITOR
           let half = Math.max(
             0,
-            (box[this.varCoord.c2] - dynamicGroup.size) * 0.5,
+            (box[this.varCoord.c2] -
+              box[this.varCoord.c1] -
+              dynamicGroup.size) *
+              0.5,
           )
 
           tl = box[this.varCoord.c1] + half
@@ -1041,19 +1035,20 @@ export const Panel = GObject.registerClass(
       }
     }
 
-    _setPanelBoxStyle() {
+    _setPanelBoxStyle(topBottomMargins, sideMargins) {
-      let topBottomMargins = SETTINGS.get_int('panel-top-bottom-margins')
+      topBottomMargins =
-      let sideMargins = SETTINGS.get_int('panel-side-margins')
+        topBottomMargins || SETTINGS.get_int('panel-top-bottom-margins')
+      sideMargins = sideMargins || SETTINGS.get_int('panel-side-margins')
 
       this.panelBox.set_style(
         `padding: ${topBottomMargins}px ${sideMargins}px;`,
       )
     }
 
-    _maybeSetDockCss() {
+    _maybeSetDockCss(disable) {
       this.remove_style_class_name('dock')
 
-      if (this.geom.dockMode) this.add_style_class_name('dock')
+      if (!disable && this.geom.dockMode) this.add_style_class_name('dock')
     }
 
     _setPanelPosition() {

src/panelManager.js

@@ -96,23 +96,6 @@ export const PanelManager = class {
     global.dashToPanel.panels = this.allPanels
     global.dashToPanel.emit('panels-created')
 
-    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 ? p.geom.h + p.geom.tbPadding : -1,
-      )
-
-      this._findPanelMenuButtons(p.panelBox).forEach((pmb) =>
-        this._adjustPanelMenuButton(pmb, p.monitor, panelPosition),
-      )
-
-      p.taskbar.iconAnimator.start()
-    })
-
     this._setDesktopIconsMargins()
     //in 3.32, BoxPointer now inherits St.Widget
     if (BoxPointer.BoxPointer.prototype.vfunc_get_preferred_height) {
@@ -647,6 +630,14 @@ export const PanelManager = class {
     panelBox._dtpIndex = monitor.index
     panelBox.set_position(0, 0)
 
+    if (panel.checkIfVertical) panelBox.set_width(-1)
+
+    this._findPanelMenuButtons(panelBox).forEach((pmb) =>
+      this._adjustPanelMenuButton(pmb, monitor, panel.getPosition()),
+    )
+
+    panel.taskbar.iconAnimator.start()
+
     return panel
   }
 
@@ -654,6 +645,10 @@ export const PanelManager = class {
     this.disable(true)
     this.allPanels = []
     this.enable(true)
+
+    // not ideal, but on startup the panel geometries are updated when the initial
+    // gnome-shell startup is complete, so simulate this here to update as well
+    Main.layoutManager.emit('startup-complete')
   }
 
   _updatePanelElementPositions() {

src/prefs.js

@@ -1214,6 +1214,17 @@ const Preferences = class {
       this._builder.get_object('multimon_multi_switch').set_sensitive(false)
     }
 
+    let panelLengthScale = {
+      objectName: 'panel_length_scale',
+      valueName: '',
+      range: LENGTH_MARKS,
+      unit: '%',
+      getValue: () =>
+        PanelSettings.getPanelLength(this._settings, this._currentMonitorIndex),
+      setValue: (value) => setPanelLength(value),
+      manualConnect: true,
+    }
+
     let setPanelLength = (value) => {
       const monitorSync = this._settings.get_boolean(
         'panel-element-positions-monitors-sync',
@@ -2930,16 +2941,6 @@ const Preferences = class {
 
     // Fine-tune panel
 
-    let panelLengthScale = {
-      objectName: 'panel_length_scale',
-      valueName: '',
-      range: LENGTH_MARKS,
-      unit: '%',
-      getValue: () =>
-        PanelSettings.getPanelLength(this._settings, this._currentMonitorIndex),
-      setValue: (value) => setPanelLength(value),
-      manualConnect: true,
-    }
     let scaleInfos = [
       {
         objectName: 'panel_size_scale',