Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-12 14:11:10 +02:00
Code Issues Releases Wiki Activity

Make 'click to' text white on grey. Draw slider thumb.

Browse Source
This commit is contained in:
James Crook 2016-06-27 00:45:19 +01:00
parent ae1605a7fd
commit d7b6761215
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/ASlider.cpp
View File

@ -676,6 +676,9 @@ void LWSlider::Draw(wxDC & paintDC)
// Set up the memory DC // Set up the memory DC
wxMemoryDC dc; wxMemoryDC dc;
mThumbBitmap = new wxBitmap( theTheme.Bitmap( bmpSliderThumb ));
#if 0
// Create the bitmap // Create the bitmap
mThumbBitmap = new wxBitmap(); mThumbBitmap = new wxBitmap();
mThumbBitmap->Create(mThumbWidth, mThumbHeight, paintDC); mThumbBitmap->Create(mThumbWidth, mThumbHeight, paintDC);
@ -738,6 +741,7 @@ void LWSlider::Draw(wxDC & paintDC)
mThumbBitmap->SetMask(new wxMask(*mThumbBitmap, transparentColour)); mThumbBitmap->SetMask(new wxMask(*mThumbBitmap, transparentColour));
#endif #endif
#endif
// //
// Now the background bitmap // Now the background bitmap
// //

12
src/widgets/Meter.cpp
View File

@ -639,12 +639,12 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
Siz.GetHeight(), Siz.GetHeight(),
Siz.GetWidth() ); Siz.GetWidth() );
destDC.SetBrush( *wxWHITE_BRUSH ); destDC.SetBrush( *wxGREY_BRUSH );
destDC.SetPen( *wxGREY_PEN ); destDC.SetPen( *wxWHITE_PEN );
destDC.DrawRectangle( r ); destDC.DrawRectangle( r );
destDC.SetBackgroundMode( wxTRANSPARENT ); destDC.SetBackgroundMode( wxTRANSPARENT );
r.SetTop( r.GetBottom() + (gap / 2) ); r.SetTop( r.GetBottom() + (gap / 2) );
destDC.SetTextForeground( wxColour(0,0,0) ); destDC.SetTextForeground( clrText );
destDC.DrawRotatedText( Text, r.GetPosition(), 90 ); destDC.DrawRotatedText( Text, r.GetPosition(), 90 );
break; break;
} }
@ -658,13 +658,13 @@ void Meter::OnPaint(wxPaintEvent & WXUNUSED(event))
Siz.GetWidth(), Siz.GetWidth(),
Siz.GetHeight() ); Siz.GetHeight() );
destDC.SetBrush( *wxWHITE_BRUSH ); destDC.SetBrush( *wxGREY_BRUSH );
destDC.SetPen( *wxGREY_PEN ); destDC.SetPen( *wxWHITE_PEN );
destDC.DrawRectangle( r ); destDC.DrawRectangle( r );
destDC.SetBackgroundMode( wxTRANSPARENT ); destDC.SetBackgroundMode( wxTRANSPARENT );
r.SetLeft( r.GetLeft() + (gap / 2) ); r.SetLeft( r.GetLeft() + (gap / 2) );
r.SetTop( r.GetTop() + (gap / 2)); r.SetTop( r.GetTop() + (gap / 2));
destDC.SetTextForeground( wxColour(0,0,0) ); destDC.SetTextForeground( clrText );
destDC.DrawText( Text, r.GetPosition() ); destDC.DrawText( Text, r.GetPosition() );
break; break;
} }