From 6c8f57238ae47c0b28e183b1470f874ee608cd94 Mon Sep 17 00:00:00 2001
From: scorpion-26 <dev.scorpion26@gmail.com>
Date: Wed, 1 Nov 2023 00:34:33 +0100
Subject: [PATCH] Add option to have right-side up icons and text

The margins are still not perfect, but it at least acceptable.
SensorTooltips is required, as the sensor texts break due to being
right-side up.

Implements https://github.com/scorpion-26/gBar/issues/48
---
 data/config    |   4 ++
 src/Bar.cpp    | 137 ++++++++++++++++++++++++++++++++++++-------------
 src/Config.cpp |   1 +
 src/Config.h   |   1 +
 src/SNI.cpp    |   3 +-
 src/Widget.h   |   7 ++-
 6 files changed, 116 insertions(+), 37 deletions(-)

diff --git a/data/config b/data/config
index 222e6a1..d0fc0c2 100644
--- a/data/config
+++ b/data/config
@@ -69,6 +69,10 @@ UseHyprlandIPC: true
 # Values are: L (Left), R (Right), T (Top), B (bottom)
 Location: T
 
+# When the location is set to side, this option forces everything (even text) to be right-side up.
+# *Always* make sure to enable SensorTooltips when enabling this option. Failure to do so *will* cause graphical issues.
+IconsAlwaysUp: false
+
 # Forces the time to be centered.
 # This can cause the right widget to clip outside, if there is not enough space on screen (e.g. when opening the text)
 # Setting this to false will definitely fix this issue, but it won't look very good, since it will be off-center.
diff --git a/src/Bar.cpp b/src/Bar.cpp
index a5ff239..78f04fb 100644
--- a/src/Bar.cpp
+++ b/src/Bar.cpp
@@ -9,6 +9,38 @@
 
 namespace Bar
 {
+    enum Side
+    {
+        Left,
+        Right,
+        Center
+    };
+
+    Alignment SideToAlignment(Side side)
+    {
+        switch (side)
+        {
+        case Left: return Alignment::Left;
+        case Right: return Alignment::Right;
+        case Center: return Alignment::Fill;
+        }
+    }
+
+    TransitionType SideToDefaultTransition(Side side)
+    {
+        switch (side)
+        {
+        case Right:
+        case Center: return TransitionType::SlideLeft;
+        case Left: return TransitionType::SlideRight;
+        }
+    }
+
+    bool RotatedIcons()
+    {
+        return (Config::Get().location == 'L' || Config::Get().location == 'R') && Config::Get().iconsAlwaysUp;
+    }
+
     static int32_t monitorID;
 
     namespace DynCtx
@@ -184,10 +216,18 @@ namespace Bar
                     std::string ico = System::BTTypeToIcon(dev);
                     tooltip += dev.name + " & ";
                     btDev += ico;
+
+                    if (RotatedIcons())
+                    {
+                        btDev += "\n";
+                    }
                 }
                 // Delete last delim
                 if (tooltip.size())
                     tooltip.erase(tooltip.end() - 3, tooltip.end());
+                if (btDev.size() && btDev.back() == '\n')
+                    btDev.erase(btDev.end() - 1);
+
                 btDevText->SetTooltip(tooltip);
                 btDevText->SetText(std::move(btDev));
             }
@@ -373,33 +413,6 @@ namespace Bar
 #endif
     }
 
-    enum Side
-    {
-        Left,
-        Right,
-        Center
-    };
-
-    Alignment SideToAlignment(Side side)
-    {
-        switch (side)
-        {
-        case Left: return Alignment::Left;
-        case Right: return Alignment::Right;
-        case Center: return Alignment::Fill;
-        }
-    }
-
-    TransitionType SideToDefaultTransition(Side side)
-    {
-        switch (side)
-        {
-        case Right:
-        case Center: return TransitionType::SlideLeft;
-        case Left: return TransitionType::SlideRight;
-        }
-    }
-
     void WidgetSensor(Widget& parent, TimerCallback<Sensor>&& callback, const std::string& sensorClass, const std::string& textClass, Text*& textPtr,
                       Side side)
     {
@@ -441,7 +454,7 @@ namespace Bar
                 case 'T':
                 case 'B': angle = -90; break;
                 case 'L':
-                case 'R': angle = 0; break;
+                case 'R': angle = RotatedIcons() ? -90 : 0; break;
                 }
                 sensor->SetStyle({angle});
                 sensor->AddTimer<Sensor>(std::move(callback), DynCtx::updateTime);
@@ -559,7 +572,8 @@ namespace Bar
                 case AudioType::Output:
                     icon->SetClass("audio-icon");
                     icon->SetText("󰕾 ");
-                    Utils::SetTransform(*icon, {-1, true, Alignment::Fill, 0, 6});
+                    if (!RotatedIcons())
+                        Utils::SetTransform(*icon, {-1, true, Alignment::Fill, 0, 6});
                     DynCtx::audioIcon = icon.get();
                     break;
                 }
@@ -626,6 +640,13 @@ namespace Bar
         text->SetClass("package-empty");
         text->SetAngle(Utils::GetAngle());
         text->AddTimer<Text>(DynCtx::UpdatePackages, 1000 * Config::Get().checkUpdateInterval, TimerDispatchBehaviour::ImmediateDispatch);
+
+        // Fix alignment when icons are always upside
+        if (RotatedIcons())
+        {
+            Utils::SetTransform(*text, Transform{}, 10, 0);
+        }
+
         parent.AddChild(std::move(text));
     }
 
@@ -641,15 +662,31 @@ namespace Bar
             devText->SetAngle(Utils::GetAngle());
             DynCtx::btDevText = devText.get();
             devText->SetClass("bt-num");
-            if (side == Side::Left)
+            if (side == Side::Left && !RotatedIcons())
+            {
                 Utils::SetTransform(*devText, {-1, true, Alignment::Fill, 6, 0});
+            }
+            else if(RotatedIcons())
+            {
+                Utils::SetTransform(*devText, {}, 6, 0);
+            }
 
             auto iconText = Widget::Create<Button>();
             iconText->OnClick(DynCtx::OnBTClick);
             iconText->SetAngle(Utils::GetAngle());
-            Utils::SetTransform(*iconText, {-1, true, Alignment::Fill, 0, 6});
             DynCtx::btIconText = iconText.get();
 
+            if (!RotatedIcons())
+            {
+                // Only add end margin when icon is rotated with the bar.
+                Utils::SetTransform(*iconText, {-1, true, Alignment::Fill, 0, 6});
+            }
+            else
+            {
+                // Align it more properly
+                Utils::SetTransform(*iconText, {}, 0, 6);
+            }
+
             switch (side)
             {
             case Side::Right:
@@ -801,14 +838,22 @@ namespace Bar
                 {
                     auto powerBoxExpand = Widget::Create<Box>();
                     powerBoxExpand->SetClass("power-box-expand");
-                    powerBoxExpand->SetSpacing({8, true});
+                    if (!RotatedIcons())
+                    {
+                        powerBoxExpand->SetSpacing({8, true});
+                        Utils::SetTransform(*powerBoxExpand, {-1, true, Alignment::Fill, 0, 6});
+                    }
                     powerBoxExpand->SetOrientation(Utils::GetOrientation());
-                    Utils::SetTransform(*powerBoxExpand, {-1, true, Alignment::Fill, 0, 6});
                     {
                         auto exitButton = Widget::Create<Button>();
                         exitButton->SetClass("exit-button");
                         exitButton->SetText("󰗼");
                         exitButton->SetAngle(Utils::GetAngle());
+                        if (RotatedIcons())
+                        {
+                            // Align in center
+                            Utils::SetTransform(*exitButton, Transform{}, 0, 2);
+                        }
                         exitButton->OnClick(
                             [setActivate](Button& but)
                             {
@@ -827,6 +872,11 @@ namespace Bar
                         lockButton->SetClass("sleep-button");
                         lockButton->SetText("");
                         lockButton->SetAngle(Utils::GetAngle());
+                        if (RotatedIcons())
+                        {
+                            // Align in center
+                            Utils::SetTransform(*lockButton, Transform{}, 0, 2);
+                        }
                         lockButton->OnClick(
                             [setActivate](Button& but)
                             {
@@ -845,6 +895,11 @@ namespace Bar
                         sleepButton->SetClass("sleep-button");
                         sleepButton->SetText("󰏤");
                         sleepButton->SetAngle(Utils::GetAngle());
+                        if (RotatedIcons())
+                        {
+                            // Align in center
+                            Utils::SetTransform(*sleepButton, Transform{}, 0, 2);
+                        }
                         sleepButton->OnClick(
                             [setActivate](Button& but)
                             {
@@ -863,7 +918,17 @@ namespace Bar
                         rebootButton->SetClass("reboot-button");
                         rebootButton->SetText("󰑐");
                         rebootButton->SetAngle(Utils::GetAngle());
-                        Utils::SetTransform(*rebootButton, {-1, true, Alignment::Fill, 0, 6});
+
+                        if (!RotatedIcons())
+                        {
+                            Utils::SetTransform(*rebootButton, {-1, false, Alignment::Fill, 0, 6});
+                        }
+                        else
+                        {
+                            // Align in center
+                            Utils::SetTransform(*rebootButton, Transform{}, 0, 2);
+                        }
+
                         rebootButton->OnClick(
                             [setActivate](Button& but)
                             {
@@ -891,7 +956,9 @@ namespace Bar
                 powerButton->SetClass("power-button");
                 powerButton->SetText(" ");
                 powerButton->SetAngle(Utils::GetAngle());
-                Utils::SetTransform(*powerButton, {24, false, Alignment::Fill});
+
+                Utils::SetTransform(*powerButton, {24, false, Alignment::Fill}, RotatedIcons() ? 10 : 0, 0);
+
                 powerButton->OnClick(
                     [setActivate](Button& but)
                     {
diff --git a/src/Config.cpp b/src/Config.cpp
index fa523d4..f57ff9c 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -252,6 +252,7 @@ void Config::Load()
         AddConfigVar("UseHyprlandIPC", config.useHyprlandIPC, lineView, foundProperty);
         AddConfigVar("EnableSNI", config.enableSNI, lineView, foundProperty);
         AddConfigVar("SensorTooltips", config.sensorTooltips, lineView, foundProperty);
+        AddConfigVar("IconsAlwaysUp", config.iconsAlwaysUp, lineView, foundProperty);
 
         AddConfigVar("MinUploadBytes", config.minUploadBytes, lineView, foundProperty);
         AddConfigVar("MaxUploadBytes", config.maxUploadBytes, lineView, foundProperty);
diff --git a/src/Config.h b/src/Config.h
index 558e1fb..c78a46e 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -39,6 +39,7 @@ public:
     bool useHyprlandIPC = true;           // Use Hyprland IPC instead of ext_workspaces protocol (Less buggy, but also less performant)
     bool enableSNI = true;                // Enable tray icon
     bool sensorTooltips = false;          // Use tooltips instead of sliders for the sensors
+    bool iconsAlwaysUp = false;           // Force icons to always point upwards in sidebar mode
 
     // Controls for color progression of the network widget
     uint32_t minUploadBytes = 0;                  // Bottom limit of the network widgets upload. Everything below it is considered "under"
diff --git a/src/SNI.cpp b/src/SNI.cpp
index ef9755d..7c6a651 100644
--- a/src/SNI.cpp
+++ b/src/SNI.cpp
@@ -438,6 +438,7 @@ namespace SNI
                       return a.name < b.name;
                   });
 
+        bool rotatedIcons = (Config::Get().location == 'L' || Config::Get().location == 'R') && Config::Get().iconsAlwaysUp;
         for (auto& item : items)
         {
             if (item.iconData)
@@ -494,7 +495,7 @@ namespace SNI
                         texture->AddPaddingTop(padding);
                     }
                 }
-                Utils::SetTransform(*texture, {size, true, Alignment::Fill}, {size, true, Alignment::Fill});
+                Utils::SetTransform(*texture, {size, true, Alignment::Fill}, {size, true, Alignment::Fill, 0, rotatedIcons ? 6 : 0});
                 texture->SetBuf(item.w, item.h, item.iconData);
                 texture->SetTooltip(item.tooltip);
                 texture->SetAngle(Utils::GetAngle() == 270 ? 90 : 0);
diff --git a/src/Widget.h b/src/Widget.h
index 9293304..05c4bdd 100644
--- a/src/Widget.h
+++ b/src/Widget.h
@@ -392,6 +392,11 @@ namespace Utils
         }
     }
 
+    inline void SetTransform(Widget& widget, const Transform& primary, int secondaryMarginBefore, int secondaryMarginAfter)
+    {
+        SetTransform(widget, primary, {-1, false, Alignment::Fill, secondaryMarginBefore, secondaryMarginAfter});
+    }
+
     inline Orientation GetOrientation()
     {
         switch (Config::Get().location)
@@ -406,7 +411,7 @@ namespace Utils
 
     inline double GetAngle()
     {
-        if (Config::Get().location == 'T' || Config::Get().location == 'B')
+        if (Config::Get().location == 'T' || Config::Get().location == 'B' || Config::Get().iconsAlwaysUp)
         {
             return 0;
         }