Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 07:43:54 +02:00
Code Issues Releases Wiki Activity

Use blue for negative Numbers

Browse Source 
The time ruler previously used blue for negative numbers, when scrolling left of zero was enabled.  This was broken by adding the dark-theme code.  Fixed now, and with a new configurable colour for it which defaults to blue if non provided.
This commit is contained in:
James Crook
2017-05-03 16:11:05 +01:00
parent a53e3010f8
commit 78135d25fd
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/AColor.cpp
View File

@@ -312,15 +312,6 @@ void AColor::Medium(wxDC * dc, bool selected)
dc->SetPen(mediumPen[index]);
}
#if 0
#ifdef EXPERIMENTAL_THEMING
UseThemeColour( dc, selected ? clrMediumSelected : clrMedium);
#endif
#ifdef EXPERIMENTAL_THEMING
UseThemeColour( dc, selected ? clrLightSelected : clrLight);
#endif
#endif
void AColor::MediumTrackInfo(wxDC * dc, bool selected)
{
#ifdef EXPERIMENTAL_THEMING

3
src/AllThemeResources.h
View File

@@ -369,7 +369,7 @@ from there. Audacity will look for a file called "Pause.png".
DEFINE_COLOUR( clrTrackBackground, wxColour( 20, 20, 20), wxT("TrackBackground") );
DEFINE_COLOUR( clrPlaceHolder1, wxColour( 255, 255, 20), wxT("Placeholder1") );
DEFINE_COLOUR( clrPlaceHolder1, wxColour( 255, 255, 20), wxT("Placeholder1") );
DEFINE_COLOUR( clrGraphLabels, wxColour( 0, 0, 0), wxT("GraphLabels") );
DEFINE_COLOUR( clrSpectroBackground, wxColour( 255, 255, 20), wxT("SpectroBackground") );
DEFINE_COLOUR( clrScrubRuler, wxColour( 255, 255, 20), wxT("ScrubRuler") );
@@ -378,6 +378,7 @@ from there. Audacity will look for a file called "Pause.png".
DEFINE_COLOUR( clrTrackNameText, wxColour( 255, 255, 20), wxT("TrackNameText") );
DEFINE_COLOUR( clrMidiZebra, wxColour( 255, 255, 20), wxT("MidiZebra") );
DEFINE_COLOUR( clrMidiLines, wxColour( 255, 255, 20), wxT("MidiLines") );
DEFINE_COLOUR( clrTextNegativeNumbers, wxColour( 0, 0, 255), wxT("TextNegativeNumbers") );
DEFINE_COLOUR( clrSpectro1, wxColour( 191, 191, 191), wxT("Spectro1") );
DEFINE_COLOUR( clrSpectro2, wxColour( 76, 153, 255), wxT("Spectro2") );

3
src/widgets/Ruler.cpp
View File

@@ -1540,8 +1540,7 @@ void Ruler::Label::Draw(wxDC&dc, bool twoTone, wxColour c) const
bool altColor = twoTone && value < 0.0;
#ifdef EXPERIMENTAL_THEMING
// TODO: handle color distinction
dc.SetTextForeground(c);
dc.SetTextForeground(altColor ? theTheme.Colour( clrTextNegativeNumbers) : c);
#else
dc.SetTextForeground(altColor ? *wxBLUE : *wxBLACK);
#endif