From a110713b63bf9531548928f4f3e2da7eba0464e7 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 17 Jun 2012 09:46:29 +0200
Subject: Properly calculate icon size, checking KDE settings instead on
 checking actual icon size.

BUG: 301988
---
 src/urlbar/urlbar.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/urlbar/urlbar.cpp')

diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 8535e045..30092911 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -53,6 +53,7 @@
 #include <KStandardDirs>
 #include <KColorScheme>
 #include <KMenu>
+#include <KIconLoader>
 
 // Qt Includes
 #include <QPainter>
@@ -753,11 +754,13 @@ void UrlBar::manageFavorites(QPoint pos)
 
 void UrlBar::updateRightIconPosition(IconButton *icon, int iconsCount)
 {
-    int iw = _icon->width();
-    int ih = _icon->height();
+    // NOTE: cannot show a (let's say) 16x16 icon in a 16x16 square.
+    // It needs some margin. It usually is 3, but using 4 (default rekonq icon margin)
+    // seems NOT a big problem and let's us using just one const ;)
+    int iconSize = IconSize(KIconLoader::Small) + c_iconMargin;
 
-    int iconWidth = width() - ((iw + c_iconMargin) * iconsCount);
-    int iconHeight = (height() - ih) / 2;
+    int iconWidth = width() - ((iconSize + c_iconMargin) * iconsCount);
+    int iconHeight = (height() - iconSize) / 2;
 
     icon->move(iconWidth, iconHeight);
 }
-- 
cgit v1.2.1