diff options
author | Sami Merila <sami.merila@nokia.com> | 2010-02-14 10:16:00 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2010-02-14 10:16:00 (GMT) |
commit | 995afbfc2ca81960ca840f50b2a837938a4f1d52 (patch) | |
tree | 8287d90d38ecf887cfe1eca798acb56619e17820 | |
parent | 4d1be3f07428651f3e366e4c09f26cff3b52d91f (diff) | |
download | Qt-995afbfc2ca81960ca840f50b2a837938a4f1d52.zip Qt-995afbfc2ca81960ca840f50b2a837938a4f1d52.tar.gz Qt-995afbfc2ca81960ca840f50b2a837938a4f1d52.tar.bz2 |
Change a name of a variable to be more descriptive
Currently when calculating a button content size, QS60Style has a
variable called buttonWidth, which actually is the width of the
content, not the button itself. Change this to buttonContentWidth.
Reviewed-by: TrustMe
-rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 9025e5b..14e9b95 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2559,11 +2559,11 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { const int frameThickness = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0; const int buttonMargin = spinbox->frame ? 2 : 0; - const int buttonWidth = QS60StylePrivate::pixelMetric(PM_ButtonIconSize) + 2 * buttonMargin; + const int buttonContentWidth = QS60StylePrivate::pixelMetric(PM_ButtonIconSize) + 2 * buttonMargin; QSize buttonSize; buttonSize.setHeight(qMax(8, spinbox->rect.height() - frameThickness)); //width should at least be equal to height - buttonSize.setWidth(qMax(buttonSize.height(), buttonWidth)); + buttonSize.setWidth(qMax(buttonSize.height(), buttonContentWidth)); buttonSize = buttonSize.expandedTo(QApplication::globalStrut()); const int y = frameThickness + spinbox->rect.y(); |