summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/botcheckerwindow.cpp1
-rw-r--r--src/gui/windows/charselectdialog.cpp4
-rw-r--r--src/gui/windows/chatwindow.cpp1
-rw-r--r--src/gui/windows/debugwindow.cpp3
-rw-r--r--src/gui/windows/editdialog.cpp17
-rw-r--r--src/gui/windows/equipmentwindow.cpp2
-rw-r--r--src/gui/windows/minimap.cpp1
-rw-r--r--src/gui/windows/npcdialog.cpp1
-rw-r--r--src/gui/windows/outfitwindow.cpp5
-rw-r--r--src/gui/windows/tradewindow.cpp2
-rw-r--r--src/gui/windows/whoisonline.cpp1
11 files changed, 23 insertions, 15 deletions
diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp
index b502dd01d..61dc7286c 100644
--- a/src/gui/windows/botcheckerwindow.cpp
+++ b/src/gui/windows/botcheckerwindow.cpp
@@ -344,6 +344,7 @@ BotCheckerWindow::BotCheckerWindow():
BotCheckerWindow::~BotCheckerWindow()
{
config.removeListener("enableBotCheker", this);
+ CHECKLISTENERS
}
void BotCheckerWindow::slowLogic()
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 763ddebd7..c7ea77784 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -236,7 +236,7 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
else if (eventId == "delete"
&& mCharacterEntries[selected]->getCharacter())
{
- new CharDeleteConfirm(this, selected);
+ (new CharDeleteConfirm(this, selected))->postInit();
return;
}
else if (eventId == "info")
@@ -393,7 +393,7 @@ void CharSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
if (idx >= 0 && mCharacterEntries[idx]
&& mCharacterEntries[idx]->getCharacter())
{
- new CharDeleteConfirm(this, idx);
+ (new CharDeleteConfirm(this, idx))->postInit();
}
break;
}
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index eade8b063..79cf0eff3 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -310,6 +310,7 @@ ChatWindow::ChatWindow():
ChatWindow::~ChatWindow()
{
config.removeListeners(this);
+ CHECKLISTENERS
saveState();
config.setValue("ReturnToggles", mReturnToggles);
removeAllWhispers();
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 7fec86369..cb5e06c3d 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -22,7 +22,6 @@
#include "gui/windows/debugwindow.h"
-#include "client.h"
#include "game.h"
#include "main.h"
@@ -43,6 +42,8 @@
#include "net/packetcounters.h"
#include "utils/gettext.h"
+#include "utils/stringutils.h"
+#include "utils/timer.h"
#include "debug.h"
diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp
index f3c583d00..a4711784e 100644
--- a/src/gui/windows/editdialog.cpp
+++ b/src/gui/windows/editdialog.cpp
@@ -26,8 +26,6 @@
#include "utils/gettext.h"
-#include <guichan/font.hpp>
-
#include "debug.h"
EditDialog::EditDialog(const std::string &title, const std::string &msg,
@@ -47,17 +45,16 @@ void EditDialog::postInit()
// TRANSLATORS: edit dialog label
Button *const okButton = new Button(this, _("OK"), mEventOk, this);
- const int numRows = 1;
- const int fontHeight = getFont()->getHeight();
- const int height = numRows * fontHeight;
const int pad = getPadding();
-
- setContentSize(mDefaultWidth, height + fontHeight + okButton->getHeight());
+ const int pad2 = pad * 2;
mTextField->setPosition(pad, pad);
- mTextField->setWidth(mDefaultWidth - 2 * pad);
-
+ mTextField->setWidth(mDefaultWidth - pad2);
+ const int buttonPadding = getOption("buttonPadding", 8)
+ + mTextField->getHeight();
+ setContentSize(mDefaultWidth, okButton->getHeight()
+ + buttonPadding + pad2);
okButton->setPosition((mDefaultWidth - okButton->getWidth()) / 2,
- height + getOption("buttonPadding", 8));
+ buttonPadding + pad);
add(mTextField);
add(okButton);
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 688fb814a..9f1ed11bf 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -169,7 +169,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
gcn::Font *const font = getFont();
const int fontHeight = font->getHeight();
- if (openGLMode != RENDER_SAFE_OPENGL)
+ if (isBatchDrawRenders(openGLMode))
{
if (mLastRedraw)
{
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 9ac4a9e26..7aefa285b 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -87,6 +87,7 @@ Minimap::~Minimap()
{
config.setValue(getWindowName() + "Show", mShow);
config.removeListeners(this);
+ CHECKLISTENERS
if (mMapImage)
{
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 3b5d0d772..1c2a6cc1d 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -209,6 +209,7 @@ void NpcDialog::postInit()
NpcDialog::~NpcDialog()
{
config.removeListeners(this);
+ CHECKLISTENERS
clearLayout();
if (mPlayerBox)
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index 306576475..704f3ce60 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -307,6 +307,7 @@ void OutfitWindow::copyOutfit(const int src, const int dst)
for (unsigned int i = 0; i < OUTFIT_ITEM_COUNT; i++)
mItems[dst][i] = mItems[src][i];
+ save();
}
void OutfitWindow::draw(gcn::Graphics *graphics)
@@ -440,6 +441,7 @@ void OutfitWindow::mousePressed(gcn::MouseEvent &event)
mItems[mCurrentOutfit][index] = dragDrop.getSelected();
mItemColors[mCurrentOutfit][index] = dragDrop.getSelectedColor();
dragDrop.deselect();
+ save();
}
}
@@ -472,6 +474,7 @@ void OutfitWindow::mouseReleased(gcn::MouseEvent &event)
mItemColors[mCurrentOutfit][index] = dragDrop.getItemColor();
dragDrop.clear();
dragDrop.deselect();
+ save();
}
}
if (mItemClicked)
@@ -629,6 +632,7 @@ void OutfitWindow::copyFromEquiped(const int dst)
break;
}
}
+ save();
}
void OutfitWindow::wearAwayOutfit()
@@ -654,4 +658,5 @@ void OutfitWindow::clearCurrentOutfit()
mItems[mCurrentOutfit][f] = -1;
mItemColors[mCurrentOutfit][f] = 1;
}
+ save();
}
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 1e25ae862..f0052e46b 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -444,7 +444,7 @@ void TradeWindow::initTrade(const std::string &nick)
Item *const item = inv->findItem(mAutoAddItem->getId(),
mAutoAddItem->getColor());
if (item)
- tradeItem(item, mAutoAddItem->getQuantity());
+ tradeItem(item, mAutoAddAmount);
}
}
if (mAutoMoney)
diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp
index c4f096c72..2e32e13fe 100644
--- a/src/gui/windows/whoisonline.cpp
+++ b/src/gui/windows/whoisonline.cpp
@@ -142,6 +142,7 @@ void WhoIsOnline::postInit()
WhoIsOnline::~WhoIsOnline()
{
config.removeListeners(this);
+ CHECKLISTENERS
if (mThread && SDL_GetThreadID(mThread))
SDL_WaitThread(mThread, nullptr);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-20 06:16:26 +0000