krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1403 from akortunov/guifixes

Browse source 
Get only text from input fields (alternative implementation)
This commit is contained in:
scrawl 2017-08-19 22:46:51 +00:00 committed by GitHub
commit d200287b4a
8 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -64,7 +64,7 @@ namespace MWGui
void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender) void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender)
{ {
MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getOnlyText()); MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ());
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager(); MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
switch (result) switch (result)

2
apps/openmw/mwgui/class.cpp
View file

@ -483,7 +483,7 @@ namespace MWGui
std::string CreateClassDialog::getName() const std::string CreateClassDialog::getName() const
{ {
return mEditName->getOnlyText(); return mEditName->getCaption();
} }
std::string CreateClassDialog::getDescription() const std::string CreateClassDialog::getDescription() const

5
apps/openmw/mwgui/enchantingdialog.cpp
View file

@ -3,7 +3,6 @@
#include <iomanip> #include <iomanip>
#include <MyGUI_Button.h> #include <MyGUI_Button.h>
#include <MyGUI_EditBox.h>
#include <MyGUI_ScrollView.h> #include <MyGUI_ScrollView.h>
#include <components/widgets/list.hpp> #include <components/widgets/list.hpp>
@ -313,7 +312,7 @@ namespace MWGui
return; return;
} }
if (mName->getOnlyText().empty()) if (mName->getCaption ().empty())
{ {
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
return; return;
@ -337,7 +336,7 @@ namespace MWGui
return; return;
} }
mEnchanting.setNewItemName(mName->getOnlyText()); mEnchanting.setNewItemName(mName->getCaption());
mEnchanting.setEffect(mEffectList); mEnchanting.setEffect(mEffectList);
MWWorld::Ptr player = MWMechanics::getPlayer(); MWWorld::Ptr player = MWMechanics::getPlayer();

2
apps/openmw/mwgui/enchantingdialog.hpp
View file

@ -58,7 +58,7 @@ namespace MWGui
MyGUI::Button* mTypeButton; MyGUI::Button* mTypeButton;
MyGUI::Button* mBuyButton; MyGUI::Button* mBuyButton;
MyGUI::EditBox* mName; MyGUI::TextBox* mName;
MyGUI::TextBox* mEnchantmentPoints; MyGUI::TextBox* mEnchantmentPoints;
MyGUI::TextBox* mCastCost; MyGUI::TextBox* mCastCost;
MyGUI::TextBox* mCharge; MyGUI::TextBox* mCharge;

4
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -248,7 +248,7 @@ namespace MWGui
dialog->eventCancelClicked.clear(); dialog->eventCancelClicked.clear();
return; return;
} }
if (mSaveNameEdit->getOnlyText().empty()) if (mSaveNameEdit->getCaption().empty())
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage65}"); MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage65}");
return; return;
@ -275,7 +275,7 @@ namespace MWGui
if (mSaving) if (mSaving)
{ {
MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getOnlyText(), mCurrentSlot); MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getCaption(), mCurrentSlot);
} }
else else
{ {

4
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -373,7 +373,7 @@ namespace MWGui
return; return;
} }
if (mNameEdit->getOnlyText() == "") if (mNameEdit->getCaption () == "")
{ {
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
return; return;
@ -394,7 +394,7 @@ namespace MWGui
return; return;
} }
mSpell.mName = mNameEdit->getOnlyText(); mSpell.mName = mNameEdit->getCaption();
int price = MyGUI::utility::parseInt(mPriceLabel->getCaption()); int price = MyGUI::utility::parseInt(mPriceLabel->getCaption());

4
apps/openmw/mwgui/textinput.cpp
View file

@ -53,7 +53,7 @@ namespace MWGui
void TextInputDialog::onOkClicked(MyGUI::Widget* _sender) void TextInputDialog::onOkClicked(MyGUI::Widget* _sender)
{ {
if (mTextEdit->getOnlyText() == "") if (mTextEdit->getCaption() == "")
{ {
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage37}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage37}");
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget (mTextEdit); MWBase::Environment::get().getWindowManager()->setKeyFocusWidget (mTextEdit);
@ -69,7 +69,7 @@ namespace MWGui
std::string TextInputDialog::getTextInput() const std::string TextInputDialog::getTextInput() const
{ {
return mTextEdit->getOnlyText(); return mTextEdit->getCaption();
} }
void TextInputDialog::setTextInput(const std::string &text) void TextInputDialog::setTextInput(const std::string &text)

8
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -1983,12 +1983,8 @@ namespace MWGui
char* text=0; char* text=0;
text = SDL_GetClipboardText(); text = SDL_GetClipboardText();
if (text) if (text)
{ _data = MyGUI::TextIterator::toTagsString(text);
// MyGUI's clipboard might still have color information, to retain that information, only set the new text
// if it actually changed (clipboard inserted by an external application)
if (MyGUI::TextIterator::getOnlyText(_data) != text)
_data = text;
}
SDL_free(text); SDL_free(text);
} }