summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/statuspopup.cpp47
-rw-r--r--src/gui/theme.cpp2
-rw-r--r--src/gui/theme.h1
3 files changed, 32 insertions, 18 deletions
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index c99ab9964..ced7c97db 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -75,21 +75,36 @@ StatusPopup::StatusPopup() :
mCameraMode->setPosition(0, 16 + 13 * fontHeight);
mDisableGameModifiers->setPosition(0, 20 + 14 * fontHeight);
- mMoveType->setForegroundColor(getThemeColor(Theme::POPUP));
- mCrazyMoveType->setForegroundColor(getThemeColor(Theme::POPUP));
- mMoveToTargetType->setForegroundColor(getThemeColor(Theme::POPUP));
- mFollowMode->setForegroundColor(getThemeColor(Theme::POPUP));
- mAttackWeaponType->setForegroundColor(getThemeColor(Theme::POPUP));
- mAttackType->setForegroundColor(getThemeColor(Theme::POPUP));
- mMagicAttackType->setForegroundColor(getThemeColor(Theme::POPUP));
- mPvpAttackType->setForegroundColor(getThemeColor(Theme::POPUP));
- mDropCounter->setForegroundColor(getThemeColor(Theme::POPUP));
- mPickUpType->setForegroundColor(getThemeColor(Theme::POPUP));
- mMapType->setForegroundColor(getThemeColor(Theme::POPUP));
- mImitationMode->setForegroundColor(getThemeColor(Theme::POPUP));
- mAwayMode->setForegroundColor(getThemeColor(Theme::POPUP));
- mCameraMode->setForegroundColor(getThemeColor(Theme::POPUP));
- mDisableGameModifiers->setForegroundColor(getThemeColor(Theme::POPUP));
+ mMoveType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mCrazyMoveType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mMoveToTargetType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mFollowMode->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mAttackWeaponType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mAttackType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mMagicAttackType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mPvpAttackType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mDropCounter->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mPickUpType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mMapType->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mImitationMode->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mAwayMode->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mCameraMode->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
+ mDisableGameModifiers->setForegroundColorAll(getThemeColor(Theme::POPUP),
+ getThemeColor(Theme::POPUP_OUTLINE));
add(mMoveType);
add(mCrazyMoveType);
@@ -106,8 +121,6 @@ StatusPopup::StatusPopup() :
add(mImitationMode);
add(mAwayMode);
add(mCameraMode);
-
-// addMouseListener(this);
}
StatusPopup::~StatusPopup()
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 32a71d3c1..d97a54cbf 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -743,6 +743,7 @@ static int readColorType(const std::string &type)
"LISTBOX_SELECTED",
"RADIOBUTTON",
"POPUP",
+ "POPUP_OUTLINE",
"TAB",
"TAB_HIGHLIGHTED",
"TAB_SELECTED",
@@ -1001,7 +1002,6 @@ void Theme::loadColors(std::string file)
mColors[paletteId * THEME_COLORS_END + type].set(
type, color, grad, 10);
-
if (!findLast(id, "_OUTLINE"))
{
const int type2 = readColorType(id + "_OUTLINE");
diff --git a/src/gui/theme.h b/src/gui/theme.h
index df293a0b6..533734c8c 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -207,6 +207,7 @@ class Theme final : public Palette, public ConfigListener
LISTBOX_SELECTED,
RADIOBUTTON,
POPUP,
+ POPUP_OUTLINE,
TAB,
TAB_HIGHLIGHTED,
TAB_SELECTED,