From 4e6f98cfd788965bd382f1722e2a5d895dda3bc6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 5 Oct 2013 20:26:59 +0300 Subject: Add support for min and max label resize size. Using it in character selection dialog. --- src/gui/windows/charcreatedialog.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/gui/windows/charcreatedialog.cpp') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index f6cd22720..a61a6f8fd 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -587,7 +587,7 @@ void CharCreateDialog::updateHair() } const ItemInfo &item = ItemDB::get(-mHairStyle); mHairStyleNameLabel->setCaption(item.getName()); - mHairStyleNameLabel->resizeTo(150); + mHairStyleNameLabel->resizeTo(150, 150); if (ColorDB::getHairSize()) mHairColor %= ColorDB::getHairSize(); @@ -601,8 +601,7 @@ void CharCreateDialog::updateHair() mHairColor = minHairColor; } mHairColorNameLabel->setCaption(ColorDB::getHairColorName(mHairColor)); - mHairColorNameLabel->adjustSize(); - mHairColorNameLabel->resizeTo(150); + mHairColorNameLabel->resizeTo(150, 150); mPlayer->setSprite(Net::getCharServerHandler()->hairSprite(), mHairStyle * -1, item.getDyeColorsString(mHairColor)); @@ -639,12 +638,12 @@ void CharCreateDialog::updateLook() if (mRaceNameLabel) { mRaceNameLabel->setCaption(item.getName()); - mRaceNameLabel->resizeTo(150); + mRaceNameLabel->resizeTo(150, 150); } if (mLookNameLabel) { mLookNameLabel->setCaption(item.getColorName(mLook)); - mLookNameLabel->resizeTo(150); + mLookNameLabel->resizeTo(150, 150); } } -- cgit v1.2.3-60-g2f50