From d3c0c94e170af04974fddda75ad10230aaea30c6 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 1 May 2016 17:28:08 -0400
Subject: [PATCH] Better choice of font size for time ruler pushbuttons

---
 src/widgets/Ruler.cpp | 52 ++++++++++++++++++++++++++++++++++---------
 src/widgets/Ruler.h   |  7 +++++-
 2 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index 579e29a2a..d5c47ec09 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -1827,8 +1827,7 @@ AdornedRulerPanel::AdornedRulerPanel(AudacityProject* parent,
    mPlayRegionDragsSelection = (gPrefs->Read(wxT("/QuickPlay/DragSelection"), 0L) == 1)? true : false; 
    mQuickPlayEnabled = !!gPrefs->Read(wxT("/QuickPlay/QuickPlayEnabled"), 1L);
 
-   int fontSize = 10;
-   mButtonFont.Create(fontSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
+   mButtonFont.Create(10, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
 
    UpdatePrefs();
 
@@ -1897,6 +1896,38 @@ void AdornedRulerPanel::UpdatePrefs()
    UpdateRects();
 
    RegenerateTooltips();
+
+   mButtonFontSize = -1;
+}
+
+wxFont &AdornedRulerPanel::GetButtonFont() const
+{
+   if (mButtonFontSize < 0) {
+      mButtonFontSize = 10;
+
+      bool done;
+      do {
+         done = true;
+         mButtonFont.SetPointSize(mButtonFontSize);
+         wxCoord width, height;
+         for (unsigned ii = 0;
+              done && ii < static_cast<unsigned>(Button::NumButtons); ++ii) {
+            auto button = static_cast<Button>(ii);
+            auto allowableWidth = GetButtonRect(button).GetWidth() - 2;
+            // 2 corresponds with the Inflate(-1, -1)
+            GetParent()->GetTextExtent(PushbuttonLabels[ii],
+                                       &width,
+                                       &height,
+                                       NULL,
+                                       NULL,
+                                       &mButtonFont);
+            done = width < allowableWidth;
+         }
+         mButtonFontSize--;
+      } while (mButtonFontSize > 0 && !done);
+   }
+
+   return mButtonFont;
 }
 
 void AdornedRulerPanel::InvalidateRuler()
@@ -2857,16 +2888,17 @@ void AdornedRulerPanel::ToggleButtonState( Button button )
    }
 }
 
+const wxString AdornedRulerPanel::PushbuttonLabels
+   [static_cast<size_t>(AdornedRulerPanel::Button::NumButtons)] {
+   XO("Quick-Play"),
+   /* i18n-hint: A long screen area (bar) controlling variable speed play (scrubbing) */
+   XO("Scrub Bar"),
+};
+
 void AdornedRulerPanel::DoDrawPushbutton(wxDC *dc, Button button, bool down) const
 {
    // Adapted from TrackInfo::DrawMuteSolo()
 
-   static const wxString labels[static_cast<size_t>(Button::NumButtons)] {
-      XO("Quick-Play"),
-      /* i18n-hint: A long screen area (bar) controlling variable speed play (scrubbing) */
-      XO("Scrub Bar"),
-   };
-
    auto bev = GetButtonRect( button );
 
    // This part corresponds to part of TrackInfo::DrawBordersWithin() :
@@ -2884,8 +2916,8 @@ void AdornedRulerPanel::DoDrawPushbutton(wxDC *dc, Button button, bool down) con
    dc->SetTextForeground(theTheme.Colour(clrTrackPanelText));
 
    wxCoord textWidth, textHeight;
-   wxString str = wxGetTranslation(labels[static_cast<unsigned>(button)]);
-   dc->SetFont(mButtonFont);
+   wxString str = wxGetTranslation(PushbuttonLabels[static_cast<unsigned>(button)]);
+   dc->SetFont(GetButtonFont());
    dc->GetTextExtent(str, &textWidth, &textHeight);
    dc->DrawText(str, bev.x + (bev.width - textWidth) / 2,
                 bev.y + (bev.height - textHeight) / 2);
diff --git a/src/widgets/Ruler.h b/src/widgets/Ruler.h
index 52a311ae1..0733ef468 100644
--- a/src/widgets/Ruler.h
+++ b/src/widgets/Ruler.h
@@ -356,6 +356,8 @@ private:
       NumButtons,
       NoButton = -1
    };
+   static const wxString PushbuttonLabels[];
+
    wxRect GetButtonRect( Button button ) const;
    bool InButtonRect( Button button ) const;
    bool GetButtonState( Button button ) const;
@@ -364,6 +366,8 @@ private:
    void DoDrawPushbuttons(wxDC *dc) const;
    void HandlePushbuttonEvent(wxMouseEvent &evt);
 
+   wxFont &GetButtonFont() const;
+
    double Pos2Time(int p, bool ignoreFisheye = false);
    int Time2Pos(double t, bool ignoreFisheye = false);
 
@@ -451,7 +455,8 @@ private:
    StatusChoice mPrevZone { StatusChoice::NoChange };
    bool mShowScrubbing { true };
 
-   wxFont mButtonFont;
+   mutable int mButtonFontSize { -1 };
+   mutable wxFont mButtonFont;
 
    DECLARE_EVENT_TABLE()
 };