summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-03 22:26:02 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-03 22:26:24 +0300
commit20a530182719a356135ba91d1b453ae7fac500f4 (patch)
tree3d138bde802bb0a1ce29d8426d6c8eb441f700ba
parente1fd136f61a0f28263098299d7d956bf42a15b32 (diff)
downloadmanaplus-20a530182719a356135ba91d1b453ae7fac500f4.tar.gz
manaplus-20a530182719a356135ba91d1b453ae7fac500f4.tar.bz2
manaplus-20a530182719a356135ba91d1b453ae7fac500f4.tar.xz
manaplus-20a530182719a356135ba91d1b453ae7fac500f4.zip
Change a bit some windows sizes for drawing big size fonts.
-rw-r--r--src/gui/charselectdialog.cpp6
-rw-r--r--src/gui/ministatuswindow.cpp3
-rw-r--r--src/gui/widgets/characterdisplay.cpp2
-rw-r--r--src/gui/widgets/characterviewnormal.cpp7
4 files changed, 14 insertions, 4 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 63f1524c8..9b96c77c0 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -23,6 +23,7 @@
#include "gui/charselectdialog.h"
#include "client.h"
+#include "configuration.h"
#include "units.h"
#include "keyevent.h"
@@ -164,7 +165,10 @@ CharSelectDialog::CharSelectDialog(LoginData *const data):
mCharacterView = new CharacterViewNormal(
this, &mCharacterEntries, mPadding);
placer(0, 1, mCharacterView, 10);
- reflowLayout(410 + 2 * mPadding);
+ if (config.getIntValue("fontSize") > 18)
+ reflowLayout(500 + 2 * mPadding);
+ else
+ reflowLayout(410 + 2 * mPadding);
}
else
{
diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp
index 9a06ac259..3450adeb4 100644
--- a/src/gui/ministatuswindow.cpp
+++ b/src/gui/ministatuswindow.cpp
@@ -83,7 +83,8 @@ MiniStatusWindow::MiniStatusWindow() :
mArrowsBar(createBar(0, 50, 0, Theme::PROG_INVY_SLOTS,
// TRANSLATORS: status bar name
"arrows bar", _("arrows bar"))),
- mStatusBar(createBar(100, 165, 0, Theme::PROG_EXP,
+ mStatusBar(createBar(100, (config.getIntValue("fontSize") > 16
+ ? 250 : 165), 0, Theme::PROG_EXP,
// TRANSLATORS: status bar name
"status bar", _("status bar"))),
mTextPopup(new TextPopup),
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 35af15efc..bff28b374 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -51,7 +51,7 @@ CharacterDisplay::CharacterDisplay(const Widget2 *const widget,
mName->adjustSize();
setWidth(80);
- setHeight(100);
+ setHeight(120);
}
void CharacterDisplay::setCharacter(Net::Character *const character)
diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 7422f25d5..f197ea343 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -20,6 +20,8 @@
#include "gui/widgets/characterviewnormal.h"
+#include "configuration.h"
+
#include "gui/widgets/characterdisplay.h"
#include "gui/widgets/characterviewsmall.h"
@@ -46,7 +48,10 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
}
const CharacterDisplay *const firtChar = (*mCharacterEntries)[0];
setWidth(firtChar->getWidth() * 5 + mPadding * 2);
- setHeight(200);
+ if (config.getIntValue("fontSize") > 16)
+ setHeight(250);
+ else
+ setHeight(220);
}
CharacterViewNormal::~CharacterViewNormal()