Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Lose system colours

Browse Source
This commit is contained in:
James Crook 2016-06-24 09:47:03 +01:00
parent 8927fd37df
commit 121284efbb
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/AColor.cpp
View File

@ -402,11 +402,17 @@ void AColor::Init()
if (inited)
return;
wxColour light =
wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
wxColour med = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
wxColour dark =
wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
wxColour light = theTheme.Colour( clrLight );
// wxSystemSettings::GetColour(wxSYS_COLOUR_3DHIGHLIGHT);
wxColour med = theTheme.Colour( clrMedium );
// wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
wxColour dark = theTheme.Colour( clrDark );
// wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
wxColour lightSelected = theTheme.Colour( clrLightSelected );
wxColour medSelected = theTheme.Colour( clrMediumSelected );
wxColour darkSelected = theTheme.Colour( clrDarkSelected );
clippingPen.SetColour(0xCC, 0x11, 0x00);
@ -466,12 +472,12 @@ void AColor::Init()
darkPen[0].SetColour(dark);
// selected
lightBrush[1].SetColour(204, 204, 255);
mediumBrush[1].SetColour(200, 200, 214);
darkBrush[1].SetColour(148, 148, 170);
lightPen[1].SetColour(204, 204, 255);
mediumPen[1].SetColour(200, 200, 214);
darkPen[1].SetColour(0, 0, 0);
lightBrush[1].SetColour(lightSelected);
mediumBrush[1].SetColour(medSelected);
darkBrush[1].SetColour(darkSelected);
lightPen[1].SetColour(lightSelected);
mediumPen[1].SetColour(medSelected);
darkPen[1].SetColour(darkSelected);
#else

11
src/widgets/Grabber.cpp
View File

@ -106,19 +106,8 @@ void Grabber::DrawGrabber( wxDC & dc )
dc.DrawRectangle(r);
#else
// Paint the background
if( mOver )
{
AColor::Medium(&dc, mOver );
dc.DrawRectangle(r);
}
else
{
// Get colour from parent...
// when parent colour changes, child colour might not!
wxBrush brush( GetParent()->GetBackgroundColour() );
dc.SetBrush( brush );
dc.DrawRectangle(r);
}
#endif
#ifndef __WXMAC__