1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-08 16:11:14 +02:00

Line to mark off scrub ruler.

Provides a clear boundary between scrub ruler and quick select ruler, even if the theme colours have been warped to be very similar.
Thanks to Gale for spotting this problem on Mac.
This commit is contained in:
James Crook 2017-04-30 17:22:20 +01:00
parent 5088881a69
commit 5e28e3fe6d
3 changed files with 8 additions and 4 deletions

View File

@ -281,13 +281,15 @@ void AColor::BevelTrackInfo(wxDC & dc, bool up, const wxRect & r)
#endif
}
void AColor::UseThemeColour( wxDC * dc, int iIndex )
void AColor::UseThemeColour( wxDC * dc, int iIndex, int index2 )
{
if (!inited)
Init();
wxColour col = theTheme.Colour( iIndex );
spareBrush.SetColour( col );
dc->SetBrush( spareBrush );
if( index2 != -1)
col = theTheme.Colour( index2 );
sparePen.SetColour( col );
dc->SetPen( sparePen );
}

View File

@ -70,7 +70,7 @@ class AColor {
static void BevelTrackInfo(wxDC & dc, bool up, const wxRect & r);
static wxColour Blend(const wxColour & c1, const wxColour & c2);
static void UseThemeColour( wxDC * dc, int iIndex );
static void UseThemeColour( wxDC * dc, int iIndex, int index2 =-1 );
static void TrackPanelBackground(wxDC * dc, bool selected);
static void Light(wxDC * dc, bool selected);

View File

@ -3103,8 +3103,10 @@ void AdornedRulerPanel::DoDrawBackground(wxDC * dc)
if (mShowScrubbing) {
// Let's distinguish the scrubbing area by using the same gray as for
// selected track control panel.
AColor::UseThemeColour(dc, clrScrubRuler );
dc->DrawRectangle(mScrubZone);
AColor::UseThemeColour(dc, clrScrubRuler, clrTrackPanelText );
wxRect ScrubRect = mScrubZone;
ScrubRect.Inflate( 1,1 );
dc->DrawRectangle(ScrubRect);
}
}