diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-30 22:53:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-31 12:50:04 +0300 |
| commit | 85c5fc06d49e8309d273873d31448688bd494d49 (patch) | |
| tree | 80d83e16ef273c147b0d1915edca44baf6899933 /src/gui | |
| parent | 60d90692e487948b77edcac63acbef34254cea5b (diff) | |
| download | manaplus-85c5fc06d49e8309d273873d31448688bd494d49.tar.gz manaplus-85c5fc06d49e8309d273873d31448688bd494d49.tar.bz2 manaplus-85c5fc06d49e8309d273873d31448688bd494d49.tar.xz manaplus-85c5fc06d49e8309d273873d31448688bd494d49.zip | |
fix code style and some minor issues.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/npcdialog.cpp | 2 | ||||
| -rw-r--r-- | src/gui/setup_input.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 27a5dbf43..22cecebd2 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -336,6 +336,7 @@ void NpcDialog::action(const gcn::ActionEvent &event) return; printText = mTextField->getText(); Net::getNpcHandler()->stringInput(mNpcId, printText); + break; } case NPC_INPUT_INTEGER: { @@ -344,6 +345,7 @@ void NpcDialog::action(const gcn::ActionEvent &event) printText = strprintf("%d", mIntField->getValue()); Net::getNpcHandler()->integerInput( mNpcId, mIntField->getValue()); + break; } case NPC_INPUT_ITEM: { diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp index d4d86ce61..0b0fd70de 100644 --- a/src/gui/setup_input.cpp +++ b/src/gui/setup_input.cpp @@ -104,6 +104,7 @@ Setup_Input::Setup_Input(const Widget2 *const widget) : // TRANSLATORS: button in input settings tab mResetKeysButton(new Button(this, _("Reset all keys"), "resetkeys", this)), mTabs(new TabStrip(this, config.getIntValue("fontSize") + 10)), + mScrollArea(new ScrollArea(mKeyList, true, "setup_input_background.xml")), mKeySetting(false), mActionDataSize(new int [9]) { @@ -125,8 +126,6 @@ Setup_Input::Setup_Input(const Widget2 *const widget) : refreshKeys(); mKeyList->addActionListener(this); - mScrollArea = new ScrollArea(mKeyList, - true, "setup_input_background.xml"); mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER); mAssignKeyButton->addActionListener(this); mAssignKeyButton->setEnabled(false); diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index a0683fa45..7d6174311 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -494,7 +494,8 @@ void Window::widgetResized(const gcn::Event &event A_UNUSED) } if (mSkin) { - const bool showClose = mCloseWindowButton && mSkin->getCloseImage(false); + const bool showClose = mCloseWindowButton + && mSkin->getCloseImage(false); const int closePadding = getOption("closePadding"); if (showClose) { |