[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [lightdm] themes/userbar: No minimum width, it looks weird with left-aligned text
From:       Aurélien Gâteau <aurelien.gateau () canonical ! com>
Date:       2012-04-17 9:01:52
Message-ID: 20120417090152.7794EA60C8 () git ! kde ! org
[Download RAW message or body]

Git commit f82ff54de5e620c89fce20885219bd23e8bc4ee5 by Aurélien Gâteau.
Committed on 17/04/2012 at 11:01.
Pushed by gateau into branch 'master'.

No minimum width, it looks weird with left-aligned text

M  +1    -1    themes/userbar/ToolButton.qml

http://commits.kde.org/lightdm/f82ff54de5e620c89fce20885219bd23e8bc4ee5

diff --git a/themes/userbar/ToolButton.qml b/themes/userbar/ToolButton.qml
index c4be042..20e4efb 100644
--- a/themes/userbar/ToolButton.qml
+++ b/themes/userbar/ToolButton.qml
@@ -84,7 +84,7 @@ FocusScope {
         if (label.paintedWidth == 0) {
             return implicitHeight
         } else {
-            return Math.max(theme.defaultFont.mSize.width*12, icon.width + label.paintedWidth \
+ surface.margins.left + surface.margins.right) + ((icon.valid) ? surface.margins.left : 0) +   \
return icon.width + label.paintedWidth + surface.margins.left + surface.margins.right + \
((icon.valid) ? surface.margins.left : 0)  }
     }
     implicitHeight: Math.max(theme.defaultFont.mSize.height*1.6, Math.max(icon.height, \
label.paintedHeight) + surface.margins.top/2 + surface.margins.bottom/2)


[prev in list] [next in list] [prev in thread] [next in thread]