[haiku-commits] haiku: hrev52507 - src/kits/tracker

  • From: axeld@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 5 Nov 2018 16:42:41 -0500 (EST)

hrev52507 adds 1 changeset to branch 'master'
old head: a55e9f5235abb5837de1b25d9d34fba117db0e54
new head: b791e997bf6e9dfc312d7a41d9a0f64c2454a494
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=b791e997bf6e+%5Ea55e9f5235ab

----------------------------------------------------------------------------

b791e997bf6e: Tracker: Improved NavIcon spacing
  
  * The spacing between icon and text now scales with the font size, too.

                                   [ Axel Dörfler <axeld@xxxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52507
Commit:      b791e997bf6e9dfc312d7a41d9a0f64c2454a494
URL:         https://git.haiku-os.org/haiku/commit/?id=b791e997bf6e
Author:      Axel Dörfler <axeld@xxxxxxxxxxxxxxxx>
Date:        Mon Nov  5 22:41:32 2018 UTC

----------------------------------------------------------------------------

1 file changed, 3 insertions(+), 2 deletions(-)
src/kits/tracker/IconMenuItem.cpp | 5 +++--

----------------------------------------------------------------------------

diff --git a/src/kits/tracker/IconMenuItem.cpp 
b/src/kits/tracker/IconMenuItem.cpp
index 3c95a305d2..e5d558f252 100644
--- a/src/kits/tracker/IconMenuItem.cpp
+++ b/src/kits/tracker/IconMenuItem.cpp
@@ -126,7 +126,8 @@ ModelMenuItem::DrawContent()
 {
        if (fDrawText) {
                BPoint drawPoint(ContentLocation());
-               drawPoint.x += ListIconSize() + (fExtraPad ? 10 : 4);
+               drawPoint.x += ListIconSize() + ListIconSize() / 4
+                       + (fExtraPad ? 6 : 0);
                if (fHeightDelta > 0)
                        drawPoint.y += ceil(fHeightDelta / 2);
                Menu()->MovePenTo(drawPoint);
@@ -184,7 +185,7 @@ ModelMenuItem::GetContentSize(float* width, float* height)
        fHeightDelta = iconSize - *height;
        if (*height < iconSize)
                *height = iconSize;
-       *width = *width + 4 + iconSize + (fExtraPad ? 18 : 0);
+       *width = *width + iconSize / 4 + iconSize + (fExtraPad ? 18 : 0);
 }
 
 


Other related posts:

  • » [haiku-commits] haiku: hrev52507 - src/kits/tracker - axeld