summaryrefslogtreecommitdiff
path: root/src/gui/widgets/tabs
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets/tabs')
-rw-r--r--src/gui/widgets/tabs/chat/chattab.cpp15
-rw-r--r--src/gui/widgets/tabs/chat/chattab.h22
-rw-r--r--src/gui/widgets/tabs/mapdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/netdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/setup_colors.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_misc.cpp4
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp14
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp8
-rw-r--r--src/gui/widgets/tabs/socialplayerstab.h1
-rw-r--r--src/gui/widgets/tabs/statdebugtab.cpp1
-rw-r--r--src/gui/widgets/tabs/tab.cpp1
-rw-r--r--src/gui/widgets/tabs/targetdebugtab.cpp1
12 files changed, 47 insertions, 24 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index b1847cde1..b09e57585 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -38,6 +38,7 @@
#include "gui/windows/chatwindow.h"
#include "gui/windows/helpwindow.h"
+#include "gui/widgets/browserbox.h"
#include "gui/widgets/scrollarea.h"
#include "gui/widgets/itemlinkhandler.h"
#include "gui/widgets/tabbedarea.h"
@@ -51,9 +52,9 @@
#include "utils/delete2.h"
#include "utils/gettext.h"
-#ifdef WIN32
+#ifdef _WIN32
#include <sys/time.h>
-#endif // WIN32
+#endif // _WIN32
#include <sstream>
@@ -437,6 +438,16 @@ void ChatTab::clearText()
mTextOutput->clearRows();
}
+const std::list<std::string> &ChatTab::getRows() const
+{
+ return mTextOutput->getRows();
+}
+
+bool ChatTab::hasRows() const
+{
+ return mTextOutput->hasRows();
+}
+
void ChatTab::handleInput(const std::string &msg)
{
if (chatHandler)
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index a08429b24..3cab5f54d 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -31,12 +31,11 @@
#include "enums/simpletypes/online.h"
#include "enums/simpletypes/tryremovecolors.h"
-#include "gui/widgets/browserbox.h"
-
#include "gui/widgets/tabs/tab.h"
#include "localconsts.h"
+class BrowserBox;
class ScrollArea;
#define debugMsg(str) \
@@ -115,10 +114,23 @@ class ChatTab notfinal : public Tab
/**
* Clears the text from the tab
+ * @see BrowserBox::clearRows
*/
void clearText();
/**
+ * Returns lines of text from the widget,
+ * @see BrowserBox::getRows
+ */
+ const std::list<std::string> &getRows() const A_WARN_UNUSED;
+
+ /**
+ * true if the widget has any lines
+ * @see BrowserBox::hasRows
+ */
+ bool hasRows() const A_WARN_UNUSED;
+
+ /**
* Handle special commands. Allows a tab to handle commands it
* defines itself.
*
@@ -147,12 +159,6 @@ class ChatTab notfinal : public Tab
void saveToLogFile(const std::string &msg) const;
- const std::list<std::string> &getRows() const A_WARN_UNUSED
- { return mTextOutput->getRows(); }
-
- bool hasRows() const A_WARN_UNUSED
- { return mTextOutput->hasRows(); }
-
void loadFromLogFile(const std::string &name,
const unsigned maxLines);
diff --git a/src/gui/widgets/tabs/mapdebugtab.cpp b/src/gui/widgets/tabs/mapdebugtab.cpp
index 4084115e5..6589f1a39 100644
--- a/src/gui/widgets/tabs/mapdebugtab.cpp
+++ b/src/gui/widgets/tabs/mapdebugtab.cpp
@@ -42,6 +42,7 @@
#include "resources/map/map.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
diff --git a/src/gui/widgets/tabs/netdebugtab.cpp b/src/gui/widgets/tabs/netdebugtab.cpp
index 3f14f1cdd..bbee16d1e 100644
--- a/src/gui/widgets/tabs/netdebugtab.cpp
+++ b/src/gui/widgets/tabs/netdebugtab.cpp
@@ -30,6 +30,7 @@
#include "net/packetcounters.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp
index 5129b1f88..dcf286bcf 100644
--- a/src/gui/widgets/tabs/setup_colors.cpp
+++ b/src/gui/widgets/tabs/setup_colors.cpp
@@ -217,8 +217,8 @@ void Setup_Colors::action(const ActionEvent &event)
const std::string &eventId = event.getId();
if (eventId == "slider_grad")
{
- updateGradType();
updateColor();
+ updateGradType();
return;
}
diff --git a/src/gui/widgets/tabs/setup_misc.cpp b/src/gui/widgets/tabs/setup_misc.cpp
index ea159e8cf..f874497b7 100644
--- a/src/gui/widgets/tabs/setup_misc.cpp
+++ b/src/gui/widgets/tabs/setup_misc.cpp
@@ -563,13 +563,13 @@ Setup_Misc::Setup_Misc(const Widget2 *const widget) :
MainConfig_true);
#endif // ANDROID
-#ifndef WIN32
+#ifndef _WIN32
// TRANSLATORS: settings option
new SetupItemTextField(_("Screenshot directory"), "",
"screenshotDirectory3", this, "screenshotDirectory3Event",
MainConfig_true,
UseBase64_true);
-#endif // WIN32
+#endif // _WIN32
// TRANSLATORS: settings option
new SetupItemIntTextField(_("Network delay between sub servers"),
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index c980280e8..662e6f356 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -239,11 +239,11 @@ void Setup_Video::apply()
* See http://libsdl.org/cgi/docwiki.cgi/SDL_SetVideoMode
*/
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
// checks for opengl usage
if (intToRenderType(config.getIntValue("opengl")) == RENDER_SOFTWARE)
{
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
if (!WindowManager::setFullScreen(fullscreen))
{
fullscreen = !fullscreen;
@@ -267,7 +267,7 @@ void Setup_Video::apply()
logger->safeError(errorMsg.str());
}
}
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
}
else
{
@@ -284,7 +284,7 @@ void Setup_Video::apply()
nullptr,
260);
}
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
config.setValue("screen", fullscreen);
}
@@ -415,7 +415,7 @@ void Setup_Video::action(const ActionEvent &event)
if (width != mainGraphics->mActualWidth
|| height != mainGraphics->mActualHeight)
{
-#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#if defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
if (intToRenderType(config.getIntValue("opengl"))
== RENDER_SOFTWARE)
{
@@ -459,11 +459,11 @@ void Setup_Video::action(const ActionEvent &event)
260);
}
}
-#else // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#else // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
mainGraphics->setWindowSize(width, height);
WindowManager::doResizeVideo(width, height, false);
-#endif // defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
+#endif // defined(_WIN32) || defined(__APPLE__) || defined(ANDROID)
}
config.setValue("oldscreen", config.getBoolValue("screen"));
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 7f0dcdae9..4ddf7ef71 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -230,12 +230,12 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
"vsyncEvent", mVSyncList, 100,
MainConfig_true);
-#if defined(WIN32) || defined(__APPLE__)
+#if defined(_WIN32) || defined(__APPLE__)
// TRANSLATORS: settings option
new SetupItemCheckBox(_("Center game window"),
"", "centerwindow", this, "centerwindowEvent",
MainConfig_true);
-#endif // defined(WIN32) || defined(__APPLE__)
+#endif // defined(_WIN32) || defined(__APPLE__)
// TRANSLATORS: settings option
new SetupItemCheckBox(_("Allow screensaver to run"),
@@ -269,7 +269,7 @@ void Setup_Visual::apply()
{
SetupTabScroll::apply();
WindowManager::applyGrabMode();
-#ifndef WIN32
+#ifndef _WIN32
WindowManager::applyScale();
-#endif // WIN32
+#endif // _WIN32
}
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 029a24746..c3f9b4f1c 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -33,6 +33,7 @@
#include "utils/gettext.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "localconsts.h"
diff --git a/src/gui/widgets/tabs/statdebugtab.cpp b/src/gui/widgets/tabs/statdebugtab.cpp
index 63ce8aee8..f6d741a3f 100644
--- a/src/gui/widgets/tabs/statdebugtab.cpp
+++ b/src/gui/widgets/tabs/statdebugtab.cpp
@@ -31,6 +31,7 @@
#include "gui/windows/chatwindow.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/perfstat.h"
#include "utils/stringutils.h"
#include "utils/timer.h"
diff --git a/src/gui/widgets/tabs/tab.cpp b/src/gui/widgets/tabs/tab.cpp
index 6e750b2cb..70e348b4c 100644
--- a/src/gui/widgets/tabs/tab.cpp
+++ b/src/gui/widgets/tabs/tab.cpp
@@ -81,6 +81,7 @@
#include "resources/image/image.h"
#include "utils/delete2.h"
+#include "utils/performance.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/targetdebugtab.cpp b/src/gui/widgets/tabs/targetdebugtab.cpp
index 4c43d2b29..5db850d5d 100644
--- a/src/gui/widgets/tabs/targetdebugtab.cpp
+++ b/src/gui/widgets/tabs/targetdebugtab.cpp
@@ -28,6 +28,7 @@
#include "gui/widgets/layouthelper.h"
#include "utils/gettext.h"
+#include "utils/performance.h"
#include "utils/stringutils.h"
#include "debug.h"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-19 18:42:29 +0000