From 84b5fd6075f3b2f98390b37c73c7490130960d53 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 6 Jun 2017 22:37:24 -0400
Subject: [PATCH] Compute default WaveTrack height analogously to NoteTrack...

... though in fact this comes to the same 150 pixels as before, given the
present layout table.
---
 src/TrackPanel.cpp | 10 ++++++++++
 src/TrackPanel.h   |  1 +
 src/WaveTrack.cpp  |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index c44dfd721..c32a756e1 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -9791,6 +9791,16 @@ unsigned TrackInfo::DefaultNoteTrackHeight()
    return (unsigned) std::max( needed, (int) Track::DefaultHeight );
 }
 
+unsigned TrackInfo::DefaultWaveTrackHeight()
+{
+   int needed =
+      kTopMargin + kBottomMargin +
+      totalTCPLines( waveTrackTCPLines ) +
+      totalTCPLines( commonTrackTCPBottomLines ) -
+      kTrackInfoSliderExtra;
+   return (unsigned) std::max( needed, (int) Track::DefaultHeight );
+}
+
 LWSlider * TrackInfo::GainSlider(WaveTrack *t, bool captured) const
 {
    wxPoint topLeft{
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index 5c8544d01..18420d8be 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -119,6 +119,7 @@ private:
 
 public:
    static unsigned DefaultNoteTrackHeight();
+   static unsigned DefaultWaveTrackHeight();
 
    LWSlider * GainSlider(WaveTrack *t, bool captured = false) const;
    LWSlider * PanSlider(WaveTrack *t, bool captured = false) const;
diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp
index 9de1ffaa2..a65baa86b 100644
--- a/src/WaveTrack.cpp
+++ b/src/WaveTrack.cpp
@@ -59,6 +59,8 @@ Track classes.
 
 #include "Experimental.h"
 
+#include "TrackPanel.h" // for TrackInfo
+
 using std::max;
 
 #ifdef EXPERIMENTAL_OUTPUT_DISPLAY
@@ -113,6 +115,8 @@ WaveTrack::WaveTrack(const std::shared_ptr<DirManager> &projDirManager, sampleFo
    mLastScaleType = -1;
    mLastdBRange = -1;
    mAutoSaveIdent = 0;
+
+   SetHeight( TrackInfo::DefaultWaveTrackHeight() );
 }
 
 WaveTrack::WaveTrack(const WaveTrack &orig):