diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp index a76a5a073..d581211d1 100644 --- a/src/toolbars/SelectionBar.cpp +++ b/src/toolbars/SelectionBar.cpp @@ -113,7 +113,14 @@ void SelectionBar::Populate() mLeftTime = mRightTime = mAudioTime = nullptr; // This will be inherited by all children: - SetFont(wxFont(9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); + SetFont(wxFont( +#ifdef __WXMAC__ + 12 +#else + 9 +#endif + , + wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); wxFlexGridSizer *mainSizer; diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp index bef455779..b5d724618 100644 --- a/src/toolbars/SpectralSelectionBar.cpp +++ b/src/toolbars/SpectralSelectionBar.cpp @@ -110,7 +110,14 @@ void SpectralSelectionBar::Populate() gPrefs->Read(preferencePath, &mbCenterAndWidth, true); // This will be inherited by all children: - SetFont(wxFont(9, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); + SetFont(wxFont( +#ifdef __WXMAC__ + 12 +#else + 9 +#endif + , + wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL)); /* we don't actually need a control yet, but we want to use its methods * to do some look-ups, so we'll have to create one. We can't make the diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index b8fef3cf3..5f534a2c7 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -996,15 +996,24 @@ void Ruler::Update(const TimeTrack* timetrack)// Envelope *speedEnv, long minSpe wxString exampleText = wxT("0.9"); //ignored for height calcs on all platforms int desiredPixelHeight; + + static const int MinPixelHeight = 10; // 8; + static const int MaxPixelHeight = +#ifdef __WXMAC__ + 10 +#else + 12 +#endif + ; + if (mOrientation == wxHORIZONTAL) desiredPixelHeight = mBottom - mTop - 5; // height less ticks and 1px gap else - desiredPixelHeight = 12; // why 12? 10 -> 12 seems to be max/min + desiredPixelHeight = MaxPixelHeight; - if (desiredPixelHeight < 10)//8) - desiredPixelHeight = 10;//8; - if (desiredPixelHeight > 12) - desiredPixelHeight = 12; + desiredPixelHeight = + std::max(MinPixelHeight, std::min(MaxPixelHeight, + desiredPixelHeight)); // Keep making the font bigger until it's too big, then subtract one. mDC->SetFont(wxFont(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));