summaryrefslogtreecommitdiff
path: root/src/interface
diff options
context:
space:
mode:
Diffstat (limited to 'src/interface')
-rw-r--r--src/interface/Appearance.cpp3
-rw-r--r--src/interface/Appearance.h1
-rw-r--r--src/interface/Button.cpp2
-rw-r--r--src/interface/Component.cpp4
4 files changed, 6 insertions, 4 deletions
diff --git a/src/interface/Appearance.cpp b/src/interface/Appearance.cpp
index c089d76..2922722 100644
--- a/src/interface/Appearance.cpp
+++ b/src/interface/Appearance.cpp
@@ -17,6 +17,7 @@ namespace ui
BackgroundHover(30, 30, 30),
BackgroundInactive(0, 0, 0),
BackgroundActive(255, 255, 255),
+ BackgroundDisabled(100, 100, 100),
TextHover(255, 255, 255),
TextInactive(255, 255, 255),
@@ -29,4 +30,4 @@ namespace ui
icon(NoIcon)
{};
-} \ No newline at end of file
+}
diff --git a/src/interface/Appearance.h b/src/interface/Appearance.h
index 6b3c44f..6c9b24f 100644
--- a/src/interface/Appearance.h
+++ b/src/interface/Appearance.h
@@ -33,6 +33,7 @@ namespace ui
ui::Colour BackgroundHover;
ui::Colour BackgroundInactive;
ui::Colour BackgroundActive;
+ ui::Colour BackgroundDisabled;
ui::Colour TextHover;
ui::Colour TextInactive;
diff --git a/src/interface/Button.cpp b/src/interface/Button.cpp
index 9a59c01..43e5980 100644
--- a/src/interface/Button.cpp
+++ b/src/interface/Button.cpp
@@ -102,7 +102,7 @@ void Button::Draw(const Point& screenPos)
else
{
g->fillrect(Position.X+1, Position.Y+1, Size.X-2, Size.Y-2, Appearance.BackgroundInactive.Red, Appearance.BackgroundInactive.Green, Appearance.BackgroundInactive.Blue, 180);
- g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 180, 180, 180, 255);
+ g->drawrect(Position.X, Position.Y, Size.X, Size.Y, Appearance.BackgroundDisabled.Red, Appearance.BackgroundDisabled.Green, Appearance.BackgroundDisabled.Blue, Appearance.BackgroundDisabled.Alpha);
g->drawtext(Position.X+textPosition.X, Position.Y+textPosition.Y, buttonDisplayText, 180, 180, 180, 255);
}
if(Appearance.icon)
diff --git a/src/interface/Component.cpp b/src/interface/Component.cpp
index aa9f8be..0094cf5 100644
--- a/src/interface/Component.cpp
+++ b/src/interface/Component.cpp
@@ -66,7 +66,7 @@ void Component::TextPosition(std::string displayText)
textWidth-=1;
if(Appearance.icon)
{
- textWidth += 15;
+ textWidth += 13;
}
int textAreaWidth = Size.X-(Appearance.Margin.Right+Appearance.Margin.Left);
@@ -99,7 +99,7 @@ void Component::TextPosition(std::string displayText)
}
if(Appearance.icon)
{
- iconPosition = textPosition-ui::Point(0, 1);
+ iconPosition = textPosition;//-ui::Point(0, 1);
textPosition.X += 15;
}
}