[ros-diffs] [reactos] 01/01: [COMCTL32] Improve status bar margin for unthemed and themed CORE-15834

[Joachim Henze]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b71429059a79942f655c1…

commit b71429059a79942f655c134b343be06b5632d8c7
Author:     Joachim Henze <Joachim.Henze(a)reactos.org>
AuthorDate: Sun Apr 7 15:15:25 2019 +0200
Commit:     Joachim Henze <Joachim.Henze(a)reactos.org>
CommitDate: Sun Apr 7 15:15:25 2019 +0200

    [COMCTL32] Improve status bar margin for unthemed and themed CORE-15834
    
    Improve further what was recently committed in
    0.4.12-dev-361-g
    da9accfba6e8eb769dcd317185a9b57d161275b7
---
 dll/win32/comctl32/status.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dll/win32/comctl32/status.c b/dll/win32/comctl32/status.c
index cfee259cd8..26e9d3a1c6 100644
--- a/dll/win32/comctl32/status.c
+++ b/dll/win32/comctl32/status.c
@@ -201,12 +201,17 @@ STATUSBAR_DrawPart (const STATUS_INFO *infoPtr, HDC hdc, const
STATUSWINDOWPART
     } else {
         r.left += x;
 #ifdef __REACTOS__
-        r.left += 3;
-        r.right -= 3;
         if (!theme)
+        {
+            r.left -= 2;
             DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
+        }
         else
+        {
+            r.left += 2;
+            r.right -= 2;
             DrawThemeText(theme, hdc, SP_PANE, 0, part->text, -1,
DT_VCENTER|DT_SINGLELINE|DT_NOPREFIX, 0, &r);
+        }
 #else
         DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
 #endif