diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-12-27 22:25:16 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-12-27 23:15:06 +0300 |
commit | ef5ba77247a2860a201c4d9177c4f3479d53538a (patch) | |
tree | ca532cf30daeea4f7d0ef357faa38c6234aed268 /src/gui | |
parent | 2dfa705d9957a24eb2fe70382795f74325e372f2 (diff) | |
download | manaplus-ef5ba77247a2860a201c4d9177c4f3479d53538a.tar.gz manaplus-ef5ba77247a2860a201c4d9177c4f3479d53538a.tar.bz2 manaplus-ef5ba77247a2860a201c4d9177c4f3479d53538a.tar.xz manaplus-ef5ba77247a2860a201c4d9177c4f3479d53538a.zip |
Add outlining support to other popups.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/beingpopup.cpp | 12 | ||||
-rw-r--r-- | src/gui/itempopup.cpp | 9 | ||||
-rw-r--r-- | src/gui/spellpopup.cpp | 6 | ||||
-rw-r--r-- | src/gui/textpopup.cpp | 9 |
4 files changed, 24 insertions, 12 deletions
diff --git a/src/gui/beingpopup.cpp b/src/gui/beingpopup.cpp index aca7afe0b..2f4450bac 100644 --- a/src/gui/beingpopup.cpp +++ b/src/gui/beingpopup.cpp @@ -57,10 +57,14 @@ BeingPopup::BeingPopup() : mBeingRank->setPosition(0, 3 * fontHeight); mBeingComment->setPosition(0, 4 * fontHeight); - mBeingParty->setForegroundColor(getThemeColor(Theme::POPUP)); - mBeingGuild->setForegroundColor(getThemeColor(Theme::POPUP)); - mBeingRank->setForegroundColor(getThemeColor(Theme::POPUP)); - mBeingComment->setForegroundColor(getThemeColor(Theme::POPUP)); + mBeingParty->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mBeingGuild->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mBeingRank->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mBeingComment->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); add(mBeingName); add(mBeingParty); diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp index 07073fb71..9d1b3920c 100644 --- a/src/gui/itempopup.cpp +++ b/src/gui/itempopup.cpp @@ -62,17 +62,20 @@ ItemPopup::ItemPopup() : // Item Description mItemDesc->setEditable(false); mItemDesc->setPosition(0, fontHeight); - mItemDesc->setForegroundColor(getThemeColor(Theme::POPUP)); + mItemDesc->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); // Item Effect mItemEffect->setEditable(false); mItemEffect->setPosition(0, 2 * fontHeight); - mItemEffect->setForegroundColor(getThemeColor(Theme::POPUP)); + mItemEffect->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); // Item Weight mItemWeight->setEditable(false); mItemWeight->setPosition(0, 3 * fontHeight); - mItemWeight->setForegroundColor(getThemeColor(Theme::POPUP)); + mItemWeight->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); add(mItemName); add(mItemDesc); diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp index e3fddc18a..0732c9c02 100644 --- a/src/gui/spellpopup.cpp +++ b/src/gui/spellpopup.cpp @@ -42,8 +42,10 @@ SpellPopup::SpellPopup(): mItemComment(new Label(this)) { mItemName->setFont(boldFont); - mItemName->setForegroundColor(getThemeColor(Theme::POPUP)); - mItemComment->setForegroundColor(getThemeColor(Theme::POPUP)); + mItemName->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mItemComment->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); add(mItemName); add(mItemComment); diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp index b1c2676a1..83165c871 100644 --- a/src/gui/textpopup.cpp +++ b/src/gui/textpopup.cpp @@ -45,11 +45,14 @@ TextPopup::TextPopup(): const int fontHeight = getFont()->getHeight(); mText1->setPosition(0, 0); - mText1->setForegroundColor(getThemeColor(Theme::POPUP)); mText2->setPosition(0, fontHeight); - mText2->setForegroundColor(getThemeColor(Theme::POPUP)); mText3->setPosition(0, 2 * fontHeight); - mText3->setForegroundColor(getThemeColor(Theme::POPUP)); + mText1->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mText2->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); + mText3->setForegroundColorAll(getThemeColor(Theme::POPUP), + getThemeColor(Theme::POPUP_OUTLINE)); add(mText1); add(mText2); |