summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 14:21:27 +0300
commit48646db55005a0da079bd2c945875dc8225e2f86 (patch)
tree4d7b18cb201682cbb32f1f1677a0935a8e7928a4 /src/gui/windows
parent9c12fcdfe590f34543fcecc2691b625c408f1746 (diff)
downloadmanaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.gz
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.bz2
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.tar.xz
manaverse-48646db55005a0da079bd2c945875dc8225e2f86.zip
Move color into gui dir.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/equipmentwindow.h8
-rw-r--r--src/gui/windows/outfitwindow.h4
-rw-r--r--src/gui/windows/serverdialog.cpp4
-rw-r--r--src/gui/windows/skilldialog.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index c9ca12bbd..0ab4ca462 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -136,10 +136,10 @@ class EquipmentWindow final : public Window,
ImageSet *mImageSet;
Being *mBeing;
std::vector<EquipmentBox*> mBoxes;
- gcn::Color mHighlightColor;
- gcn::Color mBorderColor;
- gcn::Color mLabelsColor;
- gcn::Color mLabelsColor2;
+ Color mHighlightColor;
+ Color mBorderColor;
+ Color mLabelsColor;
+ Color mLabelsColor2;
Image *mSlotBackground;
Image *mSlotHighlightedBackground;
ImageCollection *mVertexes;
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index 909b84a41..55948f834 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -115,8 +115,8 @@ class OutfitWindow final : public Window,
int mItems[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT];
int mAwayOutfit;
- gcn::Color mBorderColor;
- gcn::Color mBackgroundColor;
+ Color mBorderColor;
+ Color mBackgroundColor;
unsigned char mItemColors[OUTFITS_COUNT + 1][OUTFIT_ITEM_COUNT];
bool mItemClicked;
bool mItemsUnequip[OUTFITS_COUNT];
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index a06257b10..cbab4710d 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -236,8 +236,8 @@ public:
return 2 * getFont()->getHeight() + 5;
}
private:
- gcn::Color mNotSupportedColor;
- gcn::Color mNotSupportedColor2;
+ Color mNotSupportedColor;
+ Color mNotSupportedColor2;
};
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 9cc952ec6..2e9a8be10 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -231,8 +231,8 @@ class SkillListBox final : public ListBox
private:
SkillModel *mModel;
TextPopup *mPopup;
- gcn::Color mTextColor;
- gcn::Color mTextColor2;
+ Color mTextColor;
+ Color mTextColor2;
int mTextPadding;
int mSpacing;
bool mSkillClicked;