Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-19 14:17:41 +02:00
Code Issues Releases Wiki Activity

Set colours in AColour on all platforms.

Browse Source 
Also drop AQUA_THEME on meters.
These changes are important on MixerBoard.
This commit is contained in:
James Crook 2017-06-22 13:12:17 +01:00
parent 86901a00a1
commit d7218938ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/AColor.cpp
View File

@ -491,7 +491,6 @@ void AColor::Init()
// been snapped to the nearest boundary. // been snapped to the nearest boundary.
theTheme.SetPenColour( snapGuidePen, clrSnapGuide); theTheme.SetPenColour( snapGuidePen, clrSnapGuide);
#if defined(__WXMSW__) || defined(__WXGTK__)
// unselected // unselected
lightBrush[0].SetColour(light); lightBrush[0].SetColour(light);
mediumBrush[0].SetColour(med); mediumBrush[0].SetColour(med);
@ -508,7 +507,8 @@ void AColor::Init()
mediumPen[1].SetColour(medSelected); mediumPen[1].SetColour(medSelected);
darkPen[1].SetColour(darkSelected); darkPen[1].SetColour(darkSelected);
#else // Unthemed colours that used to be used for mac.
#if 0
#if defined(__WXMAC__) // && defined(TARGET_CARBON) #if defined(__WXMAC__) // && defined(TARGET_CARBON)

5
src/widgets/Meter.cpp
View File

@ -445,7 +445,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
// Start with a clean background // Start with a clean background
// LLL: Should research USE_AQUA_THEME usefulness... // LLL: Should research USE_AQUA_THEME usefulness...
#ifndef USE_AQUA_THEME //#ifndef USE_AQUA_THEME
#ifdef EXPERIMENTAL_THEMING #ifdef EXPERIMENTAL_THEMING
//if( !mMeterDisabled ) //if( !mMeterDisabled )
//{ //{
@ -456,7 +456,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
dc.SetPen(*wxTRANSPARENT_PEN); dc.SetPen(*wxTRANSPARENT_PEN);
dc.SetBrush(mBkgndBrush); dc.SetBrush(mBkgndBrush);
dc.DrawRectangle(0, 0, mWidth, mHeight); dc.DrawRectangle(0, 0, mWidth, mHeight);
#endif //#endif
// MixerTrackCluster style has no icon or L/R labels // MixerTrackCluster style has no icon or L/R labels
if (mStyle != MixerTrackCluster) if (mStyle != MixerTrackCluster)
@ -468,6 +468,7 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
dc.DrawBitmap(*mIcon, mIconRect.GetPosition(), true); dc.DrawBitmap(*mIcon, mIconRect.GetPosition(), true);
dc.SetFont(GetFont()); dc.SetFont(GetFont());
dc.SetTextForeground( clrText ); dc.SetTextForeground( clrText );
dc.SetTextBackground( clrBoxFill );
dc.DrawText(mLeftText, mLeftTextPos.x, mLeftTextPos.y); dc.DrawText(mLeftText, mLeftTextPos.x, mLeftTextPos.y);
dc.DrawText(mRightText, mRightTextPos.x, mRightTextPos.y); dc.DrawText(mRightText, mRightTextPos.x, mRightTextPos.y);
} }