From 35d24bbed52b7058537244e07f73b0d6751d1020 Mon Sep 17 00:00:00 2001 From: James Crook Date: Sun, 15 Apr 2018 11:48:51 +0100 Subject: [PATCH] Tweak spacing in vertical rulers. This is most relevant in MixerBoard. --- src/widgets/Ruler.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp index a778be0ae..df8627245 100644 --- a/src/widgets/Ruler.cpp +++ b/src/widgets/Ruler.cpp @@ -401,7 +401,7 @@ void Ruler::FindLinearTickSizes(double UPP) // minor tick. We want to show numbers like "-48" // in that space. // If vertical, we don't need as much space. - double units = ((mOrientation == wxHORIZONTAL) ? 22 : 12) * fabs(UPP); + double units = ((mOrientation == wxHORIZONTAL) ? 22 : 16) * fabs(UPP); mDigits = 0; @@ -1184,14 +1184,15 @@ void Ruler::Update(const TimeTrack* timetrack)// Envelope *speedEnv, long minSpe step = floor(sg * warpedD / denom); bool major = jj == 0; Tick(i, sg * step * denom, major, !major); - if( !major && mMinorLabels[mNumMinor-1].lx < mLeft ) + if( !major && mMinorLabels[mNumMinor-1].text.IsEmpty() ){ nDroppedMinorLabels++; + } } } // If we've dropped minor labels through overcrowding, then don't show // any of them. We're allowed though to drop ones which correspond to the // major numbers. - if( nDroppedMinorLabels > mNumMajor ) + if( nDroppedMinorLabels > (mNumMajor+ (mLabelEdges ? 2:0)) ) mNumMinor = 0; }