From 71679699631bd4a56365975fefa3e338387d67bc Mon Sep 17 00:00:00 2001
From: David Capello <david@igara.com>
Date: Wed, 2 Apr 2025 09:32:34 -0300
Subject: [PATCH] [theme] Fix horizontal separator alignment

---
 data/extensions/aseprite-theme/dark/theme.xml |  2 +-
 data/extensions/aseprite-theme/theme.xml      |  2 +-
 src/ui/theme.cpp                              | 39 +++++++++++--------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/data/extensions/aseprite-theme/dark/theme.xml b/data/extensions/aseprite-theme/dark/theme.xml
index b0ef5a9c7..b049c9c8e 100644
--- a/data/extensions/aseprite-theme/dark/theme.xml
+++ b/data/extensions/aseprite-theme/dark/theme.xml
@@ -709,7 +709,7 @@
         <style id="workspace_splitter">
             <background color="workspace" />
         </style>
-        <style id="horizontal_separator" border-left="2" border-top="4" border-right="2" border-bottom="0">
+        <style id="horizontal_separator" border="2">
             <background color="window_face" />
             <background-border part="separator_horz" align="middle" />
             <text color="separator_label" x="4" align="left middle" />
diff --git a/data/extensions/aseprite-theme/theme.xml b/data/extensions/aseprite-theme/theme.xml
index 9ee572fa5..3d803fa2b 100644
--- a/data/extensions/aseprite-theme/theme.xml
+++ b/data/extensions/aseprite-theme/theme.xml
@@ -702,7 +702,7 @@
         <style id="workspace_splitter">
             <background color="workspace" />
         </style>
-        <style id="horizontal_separator" border-left="2" border-top="4" border-right="2" border-bottom="0">
+        <style id="horizontal_separator" border="2">
             <background color="window_face" />
             <background-border part="separator_horz" align="middle" />
             <text color="separator_label" x="4" align="left middle" />
diff --git a/src/ui/theme.cpp b/src/ui/theme.cpp
index 06da09c4e..9d037511a 100644
--- a/src/ui/theme.cpp
+++ b/src/ui/theme.cpp
@@ -413,38 +413,45 @@ void Theme::paintLayer(Graphics* g,
 
             switch (layer.align()) {
               // Horizontal line
-              case MIDDLE:
+              case MIDDLE: {
+                const float y = guiscaled_center(rc.y, rc.h, layer.spriteBounds().h);
                 for (int x = rc.x; x < rc.x2(); x += layer.spriteBounds().w) {
                   draw(layer.spriteBounds().x,
                        layer.spriteBounds().y,
                        x,
-                       rc.y + rc.h / 2 - layer.spriteBounds().h / 2,
-                       layer.spriteBounds().w,
-                       layer.spriteBounds().h);
-                }
-                break;
-
-              // Vertical line
-              case CENTER:
-                for (int y = rc.y; y < rc.y2(); y += layer.spriteBounds().h) {
-                  draw(layer.spriteBounds().x,
-                       layer.spriteBounds().y,
-                       rc.x + rc.w / 2 - layer.spriteBounds().w / 2,
                        y,
                        layer.spriteBounds().w,
                        layer.spriteBounds().h);
                 }
                 break;
+              }
+
+              // Vertical line
+              case CENTER: {
+                const float x = guiscaled_center(rc.x, rc.w, layer.spriteBounds().w);
+                for (int y = rc.y; y < rc.y2(); y += layer.spriteBounds().h) {
+                  draw(layer.spriteBounds().x,
+                       layer.spriteBounds().y,
+                       x,
+                       y,
+                       layer.spriteBounds().w,
+                       layer.spriteBounds().h);
+                }
+                break;
+              }
 
               // One instance
-              case CENTER | MIDDLE:
+              case CENTER | MIDDLE: {
+                const float x = guiscaled_center(rc.x, rc.w, layer.spriteBounds().w);
+                const float y = guiscaled_center(rc.y, rc.h, layer.spriteBounds().h);
                 draw(layer.spriteBounds().x,
                      layer.spriteBounds().y,
-                     rc.x + rc.w / 2 - layer.spriteBounds().w / 2,
-                     rc.y + rc.h / 2 - layer.spriteBounds().h / 2,
+                     x,
+                     y,
                      layer.spriteBounds().w,
                      layer.spriteBounds().h);
                 break;
+              }
 
               // Pattern
               case 0: