Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve wxRibbonMSWArtProvider's colour scheme generation when the primary and/or secondary colours are grey (see ticket #12331).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Peter Cawley
2010-08-11 16:51:02 +00:00
parent e08b4823e8
commit 1edd60790b
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ribbon/art_msw.cpp
View File

@@ -143,21 +143,38 @@ void wxRibbonMSWArtProvider::SetColourScheme(
// tertiary not used for anything // tertiary not used for anything
// Map primary saturation from [0, 1] to [.25, .75] // Map primary saturation from [0, 1] to [.25, .75]
primary_hsl.saturation = cos(primary_hsl.saturation * M_PI) * -0.25 + 0.5; bool primary_is_gray = false;
const float gray_saturation_threshold = 0.01;
if(primary_hsl.saturation <= gray_saturation_threshold)
primary_is_gray = true;
else
{
primary_hsl.saturation = cos(primary_hsl.saturation * M_PI)
* -0.25 + 0.5;
}
// Map primary luminance from [0, 1] to [.23, .83] // Map primary luminance from [0, 1] to [.23, .83]
primary_hsl.luminance = cos(primary_hsl.luminance * M_PI) * -0.3 + 0.53; primary_hsl.luminance = cos(primary_hsl.luminance * M_PI) * -0.3 + 0.53;
// Map secondary saturation from [0, 1] to [0.16, 0.84] // Map secondary saturation from [0, 1] to [0.16, 0.84]
secondary_hsl.saturation = cos(secondary_hsl.saturation * M_PI) * -0.34 + 0.5; bool secondary_is_gray = false;
if(secondary_hsl.saturation <= gray_saturation_threshold)
secondary_is_gray = true;
else
{
secondary_hsl.saturation = cos(secondary_hsl.saturation * M_PI)
* -0.34 + 0.5;
}
// Map secondary luminance from [0, 1] to [0.1, 0.9] // Map secondary luminance from [0, 1] to [0.1, 0.9]
secondary_hsl.luminance = cos(secondary_hsl.luminance * M_PI) * -0.4 + 0.5; secondary_hsl.luminance = cos(secondary_hsl.luminance * M_PI) * -0.4 + 0.5;
#define LikePrimary(h, s, l) \ #define LikePrimary(h, s, l) \
primary_hsl.ShiftHue(h ## f).Saturated(s ## f).Lighter(l ## f).ToRGB() primary_hsl.ShiftHue(h ## f).Saturated(primary_is_gray ? 0 : s ## f) \
.Lighter(l ## f).ToRGB()
#define LikeSecondary(h, s, l) \ #define LikeSecondary(h, s, l) \
secondary_hsl.ShiftHue(h ## f).Saturated(s ## f).Lighter(l ## f).ToRGB() secondary_hsl.ShiftHue(h ## f).Saturated(secondary_is_gray ? 0 : s ## f) \
.Lighter(l ## f).ToRGB()
m_page_border_pen = LikePrimary(1.4, 0.00, -0.08); m_page_border_pen = LikePrimary(1.4, 0.00, -0.08);