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

Set colours for MixerBoard

Browse Source
This commit is contained in:
James Crook 2016-08-18 22:17:05 +01:00
parent 7901b616ad
commit 18422d0e5f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/MixerBoard.cpp
View File

@ -21,6 +21,7 @@
#include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric #include <wx/settings.h> // for wxSystemSettings::GetColour and wxSystemSettings::GetMetric
#include "AColor.h" #include "AColor.h"
#include "AllThemeResources.h"
#include "AudioIO.h" #include "AudioIO.h"
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
#include "NoteTrack.h" #include "NoteTrack.h"
@ -179,8 +180,8 @@ MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
SetName(mLeftTrack->GetName()); SetName(mLeftTrack->GetName());
this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); //this->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
this->SetBackgroundColour( theTheme.Colour( clrMedium ) );
// Not sure why, but sizers weren't getting offset vertically, // Not sure why, but sizers weren't getting offset vertically,
// probably because not using wxDefaultPosition, // probably because not using wxDefaultPosition,
// so positions are calculated explicitly below, and sizers code was removed. // so positions are calculated explicitly below, and sizers code was removed.
@ -199,6 +200,7 @@ MixerTrackCluster::MixerTrackCluster(wxWindow* parent,
#endif #endif
//v Useful when different tracks are different colors, but not now. //v Useful when different tracks are different colors, but not now.
// mStaticText_TrackName->SetBackgroundColour(this->GetTrackColor()); // mStaticText_TrackName->SetBackgroundColour(this->GetTrackColor());
mStaticText_TrackName->SetForegroundColour(theTheme.Colour(clrTrackPanelText));
// gain slider at left // gain slider at left
@ -944,11 +946,12 @@ MixerBoard::MixerBoard(AudacityProject* pProject,
wxHSCROLL); // long style = wxHSCROLL | wxVSCROLL, const wxString& name = "scrolledWindow") wxHSCROLL); // long style = wxHSCROLL | wxVSCROLL, const wxString& name = "scrolledWindow")
// Set background color to same as TrackPanel background. // Set background color to same as TrackPanel background.
#ifdef EXPERIMENTAL_THEMING // #ifdef EXPERIMENTAL_THEMING
mScrolledWindow->SetBackgroundColour(this->GetParent()->GetBackgroundColour()); // mScrolledWindow->SetBackgroundColour(this->GetParent()->GetBackgroundColour());
#else // #else
mScrolledWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW)); // mScrolledWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW));
#endif // #endif
mScrolledWindow->SetBackgroundColour( theTheme.Colour( clrMedium ) );
mScrolledWindow->SetScrollRate(10, 0); // no vertical scroll mScrolledWindow->SetScrollRate(10, 0); // no vertical scroll
mScrolledWindow->SetVirtualSize(size); mScrolledWindow->SetVirtualSize(size);
@ -1393,6 +1396,7 @@ void MixerBoard::CreateMuteSoloImages()
{ {
// Much of this is taken from TrackLabel::DrawMuteSolo. // Much of this is taken from TrackLabel::DrawMuteSolo.
wxMemoryDC dc; wxMemoryDC dc;
dc.SetTextForeground(theTheme.Colour(clrTrackPanelText));
wxString str = _("Mute"); wxString str = _("Mute");
int textWidth, textHeight; int textWidth, textHeight;