Changeset 846 for trunk/src/gui/widgets/qcommandlinkbutton.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qcommandlinkbutton.cpp (modified) (8 diffs)

trunk/src/gui/widgets/qcommandlinkbutton.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -47 +47 @@
 #include "qcolor.h"
 #include "qfont.h"
+
 
 #include "private/qpushbutton_p.h"
@@ -118 +119 @@
     int leftMargin() const { return 7; }
     int rightMargin() const { return 4; }
-    int bottomMargin() const { return 4; }
+    int bottomMargin() const { return ; }
 
     QString description;
@@ -174 +175 @@
 {
     Q_Q(const QCommandLinkButton);
-    return q->rect().adjusted(textOffset(), topMargin(),
-                              -rightMargin(), 0);
+    QRect r = q->rect().adjusted(textOffset(), topMargin(), -rightMargin(), 0);
+    if (description.isEmpty())
+    {
+        QFontMetrics fm(titleFont());
+        r.setTop(r.top() + qMax(0, (q->icon().actualSize(q->iconSize()).height()
+                 - fm.height()) / 2));
+    }
+
+    return r;
 }
 
@@ -243 +251 @@
         layout.endLayout();
     }
-    return qRound(descriptionheight);
+    return q(descriptionheight);
 }
 
@@ -254 +262 @@
     QSize size = sizeHint();
     int minimumHeight = qMax(d->descriptionOffset() + d->bottomMargin(),
-                             iconSize().height() + d->topMargin());
+                             icon).height() + d->topMargin());
     size.setHeight(minimumHeight);
     return size;
@@ -328 +336 @@
     // find the width available for the description area
     return qMax(heightWithoutDescription + d->descriptionHeight(width),
-                iconSize().height() + d->topMargin() + d->bottomMargin());
+                icon().actualSize(iconSize()).height() + d->topMargin() +
+                d->bottomMargin());
 }
 
@@ -341 +350 @@
     initStyleOption(&option);
 
-    //Enable command link appearence on Vista
+    //Enable command link appearnce on Vista
     option.features |= QStyleOptionButton::CommandLinkButton;
     option.text = QString();