summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/chatwindow.cpp3
-rw-r--r--src/gui/windows/editserverdialog.cpp3
-rw-r--r--src/gui/windows/inventorywindow.cpp2
-rw-r--r--src/gui/windows/itemamountwindow.cpp7
-rw-r--r--src/gui/windows/logindialog.cpp3
-rw-r--r--src/gui/windows/textcommandeditor.cpp9
6 files changed, 19 insertions, 8 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 9eb01a3ad..b3d1679a2 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -107,7 +107,8 @@ ChatWindow::ChatWindow(const std::string &name) :
mCustomWords(),
mTradeFilter(),
mColorListModel(new ColorListModel),
- mColorPicker(new DropDown(this, mColorListModel)),
+ mColorPicker(new DropDown(this, mColorListModel,
+ false, Modal_false, nullptr, std::string())),
mChatButton(new Button(this, ":)", "openemote", this)),
mAwayLog(),
mHighlights(),
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index a659612fb..4354a5b29 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -69,7 +69,8 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent,
mPersistentIp(new CheckBox(this, _("Use same ip"),
true, this, "persistentIp")),
mTypeListModel(new TypeListModel),
- mTypeField(new DropDown(this, mTypeListModel, false, Modal_true)),
+ mTypeField(new DropDown(this, mTypeListModel,
+ false, Modal_true, nullptr, std::string())),
mServerDialog(parent),
mServer(server),
mIndex(index)
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 00ce036e8..088f67c42 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -1028,7 +1028,7 @@ void InventoryWindow::widgetResized(const Event &event)
void InventoryWindow::setVisible(Visible visible)
{
if (visible == Visible_false)
- mSortDropDown->hideDrop();
+ mSortDropDown->hideDrop(true);
Window::setVisible(visible);
}
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 773e53e82..1e568572a 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -187,7 +187,12 @@ ItemAmountWindow::ItemAmountWindow(const ItemAmountWindowUsageT usage,
if (mUsage == ItemAmountWindowUsage::ShopBuyAdd)
{
mItemsModal = new ItemsModal;
- mItemDropDown = new DropDown(this, mItemsModal);
+ mItemDropDown = new DropDown(this,
+ mItemsModal,
+ false,
+ Modal_false,
+ nullptr,
+ std::string());
mItemDropDown->setActionEventId("itemType");
mItemDropDown->addActionListener(this);
}
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 076ce14df..0f9829ae5 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -78,7 +78,8 @@ LoginDialog::LoginDialog(LoginData &data,
// TRANSLATORS: login dialog label
mUpdateTypeLabel(new Label(this, _("Update:"))),
mUpdateTypeModel(new UpdateTypeModel),
- mUpdateTypeDropDown(new DropDown(this, mUpdateTypeModel)),
+ mUpdateTypeDropDown(new DropDown(this, mUpdateTypeModel,
+ false, Modal_false, nullptr, std::string())),
// TRANSLATORS: login dialog button
mServerButton(new Button(this, _("Change Server"), "server", this)),
// TRANSLATORS: login dialog button
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 1e6407a85..d59868131 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -81,11 +81,13 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) :
mTargetTypeModel(new TargetTypeModel),
// TRANSLATORS: command editor label
mTypeLabel(new Label(this, _("Target Type:"))),
- mTypeDropDown(new DropDown(this, mTargetTypeModel)),
+ mTypeDropDown(new DropDown(this, mTargetTypeModel,
+ false, Modal_false, nullptr, std::string())),
mIconsModel(new IconsModel),
// TRANSLATORS: command editor label
mIconLabel(new Label(this, _("Icon:"))),
- mIconDropDown(new DropDown(this, mIconsModel)),
+ mIconDropDown(new DropDown(this, mIconsModel,
+ false, Modal_false, nullptr, std::string())),
#ifdef TMWA_SUPPORT
// TRANSLATORS: command editor label
mManaLabel(new Label(this, _("Mana:"))),
@@ -96,7 +98,8 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) :
mMagicSchoolModel(new MagicSchoolModel),
// TRANSLATORS: command editor label
mSchoolLabel(new Label(this, _("Magic School:"))),
- mSchoolDropDown(new DropDown(this, mMagicSchoolModel)),
+ mSchoolDropDown(new DropDown(this, mMagicSchoolModel,
+ false, Modal_false, nullptr, std::string())),
// TRANSLATORS: command editor label
mSchoolLvlLabel(new Label(this, _("School level:"))),
mSchoolLvlField(new IntTextField(this, 0, 0, 0, Enable_true, 0)),