From d6c19fa97b00fbb2de408dfd928837a93b0fdd56 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <charlesg99@outlook.com>
Date: Wed, 11 Sep 2019 12:30:11 -0400
Subject: [PATCH] Adjust fine-tune styles for vertical panel

---
 panel.js       |  8 --------
 panelStyle.js  | 22 +++++++++++-----------
 stylesheet.css |  6 +++++-
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/panel.js b/panel.js
index c11abf2..7ac7a82 100644
--- a/panel.js
+++ b/panel.js
@@ -719,15 +719,7 @@ var dtpPanel = Utils.defineClass({
             let child = actor.get_first_child();
 
             if (child) {
-                let currentStyle = child.get_style();
-                let style = 'padding: ' + (isVertical ? '6px 0' : '0');
-
-                if (currentStyle && currentStyle != style) {
-                    style = currentStyle + (currentStyle.trim().slice(-1) != ';' ? ';' : '') + style;
-                }
-
                 actor.set_width(isVertical ? size : -1);
-                child.set_style(style);
             }
         }
 
diff --git a/panelStyle.js b/panelStyle.js
index ce67e9d..36d8e23 100644
--- a/panelStyle.js
+++ b/panelStyle.js
@@ -29,6 +29,7 @@ const Mainloop = imports.mainloop;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
+const Panel = Me.imports.panel;
 const Taskbar = Me.imports.taskbar;
 const Utils = Me.imports.utils;
 
@@ -78,14 +79,15 @@ var dtpPanelStyle = Utils.defineClass({
         this._rightBoxOperations = [];
         
         let trayPadding = Me.settings.get_int('tray-padding');
+        let isVertical = Panel.checkIfVertical();
+        let paddingStyle = 'padding: ' + (isVertical ? '%dpx 0' : '0 %dpx');
+
         if(trayPadding >= 0) {
-            let trayPaddingStyleLine = '-natural-hpadding: %dpx'.format(trayPadding);
-            if (trayPadding < 6) {
-                trayPaddingStyleLine += '; -minimum-hpadding: %dpx'.format(trayPadding);
-            }
+            let trayPaddingStyleLine = paddingStyle.format(trayPadding,);
             let operation = {};
             operation.compareFn = function (actor) {
-                return (actor.has_style_class_name && actor.has_style_class_name('panel-button'));
+                let parent = actor.get_parent();
+                return (parent && parent.has_style_class_name && parent.has_style_class_name('panel-button'));
             };
             operation.applyFn = Lang.bind(this, function (actor, operationIdx) {
                 this._overrideStyle(actor, trayPaddingStyleLine, operationIdx);
@@ -95,7 +97,7 @@ var dtpPanelStyle = Utils.defineClass({
 
         let statusIconPadding = Me.settings.get_int('status-icon-padding');
         if(statusIconPadding >= 0) {
-            let statusIconPaddingStyleLine = 'padding-left: %dpx; padding-right: %dpx'.format(statusIconPadding, statusIconPadding)
+            let statusIconPaddingStyleLine = paddingStyle.format(statusIconPadding)
             let operation = {};
             operation.compareFn = function (actor) {
                 return (actor.has_style_class_name && actor.has_style_class_name('system-status-icon'));
@@ -139,13 +141,11 @@ var dtpPanelStyle = Utils.defineClass({
 
         let leftboxPadding = Me.settings.get_int('leftbox-padding');
         if(leftboxPadding >= 0) {
-            let leftboxPaddingStyleLine = '-natural-hpadding: %dpx'.format(leftboxPadding);
-            if (leftboxPadding < 6) {
-                leftboxPaddingStyleLine += '; -minimum-hpadding: %dpx'.format(leftboxPadding);
-            }
+            let leftboxPaddingStyleLine = paddingStyle.format(leftboxPadding);
             let operation = {};
             operation.compareFn = function (actor) {
-                return (actor.has_style_class_name && actor.has_style_class_name('panel-button'));
+                let parent = actor.get_parent();
+                return (parent && parent.has_style_class_name && parent.has_style_class_name('panel-button'));
             };
             operation.applyFn = Lang.bind(this, function (actor, operationIdx) {
                 this._overrideStyle(actor, leftboxPaddingStyleLine, operationIdx);
diff --git a/stylesheet.css b/stylesheet.css
index 4a71286..2578b1c 100644
--- a/stylesheet.css
+++ b/stylesheet.css
@@ -73,7 +73,11 @@
 
 .dashtopanelPanel.vertical .panel-button * {
 	padding: 0;
-	margin: 1px 0; 
+	margin: 0; 
+}
+
+.dashtopanelPanel.vertical .panel-button > * {
+	padding: 6px 0;
 }
 
 #dashtopanelThumbnailList {