From dd27cb2e07476b7bed6f5b170f98ae14fc37986c Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Thu, 17 Jul 2014 20:11:06 +0200 Subject: [PATCH] Add constructors for RGBAColor --- src/gmenu2x.cpp | 12 ++++++------ src/surface.h | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp index 436125e..7e69604 100644 --- a/src/gmenu2x.cpp +++ b/src/gmenu2x.cpp @@ -802,12 +802,12 @@ void GMenu2X::setSkin(const string &skin, bool setWallpaper) { sc.setSkin(skin); //reset colors to the default values - skinConfColors[COLOR_TOP_BAR_BG] = (RGBAColor){255,255,255,130}; - skinConfColors[COLOR_BOTTOM_BAR_BG] = (RGBAColor){255,255,255,130}; - skinConfColors[COLOR_SELECTION_BG] = (RGBAColor){255,255,255,130}; - skinConfColors[COLOR_MESSAGE_BOX_BG] = (RGBAColor){255,255,255,255}; - skinConfColors[COLOR_MESSAGE_BOX_BORDER] = (RGBAColor){80,80,80,255}; - skinConfColors[COLOR_MESSAGE_BOX_SELECTION] = (RGBAColor){160,160,160,255}; + skinConfColors[COLOR_TOP_BAR_BG] = RGBAColor(255, 255, 255, 130); + skinConfColors[COLOR_BOTTOM_BAR_BG] = RGBAColor(255, 255, 255, 130); + skinConfColors[COLOR_SELECTION_BG] = RGBAColor(255, 255, 255, 130); + skinConfColors[COLOR_MESSAGE_BOX_BG] = RGBAColor(255, 255, 255); + skinConfColors[COLOR_MESSAGE_BOX_BORDER] = RGBAColor(80, 80, 80); + skinConfColors[COLOR_MESSAGE_BOX_SELECTION] = RGBAColor(160, 160, 160); /* Load skin settings from user directory if present, * or from the system directory. */ diff --git a/src/surface.h b/src/surface.h index 9108b88..f81a073 100644 --- a/src/surface.h +++ b/src/surface.h @@ -30,6 +30,9 @@ struct RGBAColor { uint8_t r, g, b, a; static RGBAColor fromString(std::string const& strColor); + RGBAColor() : r(0), g(0), b(0), a(0) {} + RGBAColor(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255) + : r(r), g(g), b(b), a(a) {} }; /**