From 9e5ccbcca9ce09299f6b07e4e7db5d7e60074eba Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 28 Jul 2015 12:25:15 -0300 Subject: [PATCH] Remove StatusBar color names in status_bar.cpp --- src/app/ui/status_bar.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp index 36c9a4b2d..a4949005f 100644 --- a/src/app/ui/status_bar.cpp +++ b/src/app/ui/status_bar.cpp @@ -54,9 +54,6 @@ using namespace gfx; using namespace ui; using namespace doc; -static const char* kStatusBarText = "status_bar_text"; -static const char* kStatusBarFace = "status_bar_face"; - class StatusBar::CustomizedTipWindow : public ui::TipWindow { public: CustomizedTipWindow(const char* text) @@ -145,7 +142,7 @@ StatusBar::StatusBar() setDoubleBuffered(true); SkinTheme* theme = static_cast(this->getTheme()); - setBgColor(theme->getColorById(kStatusBarFace)); + setBgColor(theme->colors.statusBarFace()); this->setFocusStop(true); @@ -353,7 +350,7 @@ void StatusBar::onPreferredSize(PreferredSizeEvent& ev) void StatusBar::onPaint(ui::PaintEvent& ev) { SkinTheme* theme = static_cast(this->getTheme()); - gfx::Color textColor = theme->getColorById(kStatusBarText); + gfx::Color textColor = theme->colors.statusBarText(); Rect rc = getClientBounds(); Graphics* g = ev.getGraphics();