diff options
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/WidgetThemeLibrary.hxx | 63 | ||||
-rw-r--r-- | vcl/inc/WidgetThemeLibraryTypes.hxx | 45 |
2 files changed, 52 insertions, 56 deletions
diff --git a/vcl/inc/WidgetThemeLibrary.hxx b/vcl/inc/WidgetThemeLibrary.hxx index 488781496cad..9d916895d43b 100644 --- a/vcl/inc/WidgetThemeLibrary.hxx +++ b/vcl/inc/WidgetThemeLibrary.hxx @@ -22,19 +22,56 @@ namespace vcl struct WidgetDrawStyle { uint32_t nSize; - Color maFaceColor; - Color maLightColor; - Color maLightBorderColor; - Color maShadowColor; - Color maDarkShadowColor; - Color maHighlightColor; - Color maHighlightTextColor; - Color maActiveTabColor; - Color maInactiveTabColor; - Color maWindowColor; - Color maWindowTextColor; - Color maDialogColor; - Color maDialogTextColor; + uint32_t maFaceColor; + uint32_t maCheckedColor; + uint32_t maLightColor; + uint32_t maLightBorderColor; + uint32_t maShadowColor; + uint32_t maDarkShadowColor; + uint32_t maButtonTextColor; + uint32_t maButtonRolloverTextColor; + uint32_t maRadioCheckTextColor; + uint32_t maGroupTextColor; + uint32_t maLabelTextColor; + uint32_t maWindowColor; + uint32_t maWindowTextColor; + uint32_t maDialogColor; + uint32_t maDialogTextColor; + uint32_t maWorkspaceColor; + uint32_t maMonoColor; + uint32_t maFieldColor; + uint32_t maFieldTextColor; + uint32_t maFieldRolloverTextColor; + uint32_t maActiveColor; + uint32_t maActiveTextColor; + uint32_t maActiveBorderColor; + uint32_t maDeactiveColor; + uint32_t maDeactiveTextColor; + uint32_t maDeactiveBorderColor; + uint32_t maMenuColor; + uint32_t maMenuBarColor; + uint32_t maMenuBarRolloverColor; + uint32_t maMenuBorderColor; + uint32_t maMenuTextColor; + uint32_t maMenuBarTextColor; + uint32_t maMenuBarRolloverTextColor; + uint32_t maMenuBarHighlightTextColor; + uint32_t maMenuHighlightColor; + uint32_t maMenuHighlightTextColor; + uint32_t maHighlightColor; + uint32_t maHighlightTextColor; + uint32_t maActiveTabColor; + uint32_t maInactiveTabColor; + uint32_t maTabTextColor; + uint32_t maTabRolloverTextColor; + uint32_t maTabHighlightTextColor; + uint32_t maDisableColor; + uint32_t maHelpColor; + uint32_t maHelpTextColor; + uint32_t maLinkColor; + uint32_t maVisitedLinkColor; + uint32_t maToolTextColor; + uint32_t maFontColor; }; struct ControlDrawParameters diff --git a/vcl/inc/WidgetThemeLibraryTypes.hxx b/vcl/inc/WidgetThemeLibraryTypes.hxx index a5a32109142d..c8a492313356 100644 --- a/vcl/inc/WidgetThemeLibraryTypes.hxx +++ b/vcl/inc/WidgetThemeLibraryTypes.hxx @@ -236,16 +236,15 @@ enum class ButtonValue { }; // Color types -typedef uint32_t ColorData; -constexpr ColorData RGB_COLORDATA(uint8_t r, uint8_t g, uint8_t b) { +constexpr uint32_t RGB_COLORDATA(uint8_t r, uint8_t g, uint8_t b) { return uint32_t(b) | (uint32_t(g) << 8) | (uint32_t(r) << 16); } #define COLORDATA_RED( n ) ((uint8_t)((n)>>16)) #define COLORDATA_GREEN( n ) ((uint8_t)(((uint16_t)(n)) >> 8)) #define COLORDATA_BLUE( n ) ((uint8_t)(n)) -#define COLORDATA_RGB( n ) ((ColorData)((n) & 0x00FFFFFF)) +#define COLORDATA_RGB( n ) ((uint32_t)((n) & 0x00FFFFFF)) #define COL_BLACK RGB_COLORDATA( 0x00, 0x00, 0x00 ) #define COL_BLUE RGB_COLORDATA( 0x00, 0x00, 0x80 ) @@ -273,46 +272,6 @@ constexpr ColorData RGB_COLORDATA(uint8_t r, uint8_t g, uint8_t b) { # define SAL_DLLPUBLIC_EXPORT __attribute__ ((visibility("default"))) #endif -class SAL_DLLPUBLIC_EXPORT Color final -{ - ColorData mnColor; - -public: - explicit Color(ColorData nColor = COL_BLACK) - : mnColor(nColor) - {} - Color(uint8_t nRed, uint8_t nGreen, uint8_t nBlue) - : mnColor(RGB_COLORDATA(nRed, nGreen, nBlue)) - {} - - bool operator<(const Color& b) const - { - return mnColor < b.GetColor(); - } - - void SetColor(ColorData nColor) - { - mnColor = nColor; - } - ColorData GetColor() const - { - return mnColor; - } - ColorData GetRGBColor() const - { - return COLORDATA_RGB(mnColor); - } - - bool operator==(const Color& rColor) const - { - return mnColor == rColor.mnColor; - } - bool operator!=(const Color& rColor) const - { - return !(Color::operator==(rColor)); - } -}; - namespace tools { |