Make auto track count an option that is on by default

Author: juzzlin

src/application/service/settings_service.cpp

@@ -33,6 +33,7 @@ SettingsService::SettingsService()
   , m_velocity { Settings::velocity(100) }
   , m_visibleLines { Settings::visibleLines(32) }
   , m_trackHeaderFontSize { Settings::trackHeaderFontSize(20) }
+  , m_autoTrackCount { Settings::autoTrackCount() }
   , m_recordingEnabled { Settings::recordingEnabled() }
   , m_audioBackend { static_cast<int>(Settings::audioBackend()) }
   , m_audioBufferSize { Settings::audioBufferSize() }
@@ -166,6 +167,20 @@ void SettingsService::setTrackHeaderFontSize(int trackHeaderFontSize)
     }
 }
 
+bool SettingsService::autoTrackCount() const
+{
+    return m_autoTrackCount;
+}
+
+void SettingsService::setAutoTrackCount(bool enabled)
+{
+    if (m_autoTrackCount != enabled) {
+        m_autoTrackCount = enabled;
+        Settings::setAutoTrackCount(enabled);
+        emit autoTrackCountChanged();
+    }
+}
+
 bool SettingsService::recordingEnabled() const
 {
     return m_recordingEnabled;

src/application/service/settings_service.hpp

@@ -31,6 +31,7 @@ class SettingsService : public QObject
     Q_PROPERTY(bool uiUpdatesDisabledDuringPlayback READ uiUpdatesDisabledDuringPlayback WRITE setUiUpdatesDisabledDuringPlayback NOTIFY uiUpdatesDisabledDuringPlaybackChanged)
     Q_PROPERTY(int visibleLines READ visibleLines WRITE setVisibleLines NOTIFY visibleLinesChanged)
     Q_PROPERTY(int trackHeaderFontSize READ trackHeaderFontSize WRITE setTrackHeaderFontSize NOTIFY trackHeaderFontSizeChanged)
+    Q_PROPERTY(bool autoTrackCount READ autoTrackCount WRITE setAutoTrackCount NOTIFY autoTrackCountChanged)
     Q_PROPERTY(bool recordingEnabled READ recordingEnabled WRITE setRecordingEnabled NOTIFY recordingEnabledChanged)
     Q_PROPERTY(int audioBackend READ audioBackend WRITE setAudioBackend NOTIFY audioBackendChanged)
     Q_PROPERTY(bool multiThreadedPlaybackEnabled READ multiThreadedPlaybackEnabled WRITE setMultiThreadedPlaybackEnabled NOTIFY multiThreadedPlaybackEnabledChanged)
@@ -77,6 +78,9 @@ class SettingsService : public QObject
     virtual Q_INVOKABLE int trackHeaderFontSize() const;
     virtual Q_INVOKABLE void setTrackHeaderFontSize(int trackHeaderFontSize);
 
+    virtual Q_INVOKABLE bool autoTrackCount() const;
+    virtual Q_INVOKABLE void setAutoTrackCount(bool autoTrackCount);
+
     virtual Q_INVOKABLE bool recordingEnabled() const;
     virtual Q_INVOKABLE void setRecordingEnabled(bool enabled);
 
@@ -134,6 +138,7 @@ class SettingsService : public QObject
 
     void visibleLinesChanged();
     void trackHeaderFontSizeChanged();
+    void autoTrackCountChanged();
     void recordingEnabledChanged();
     void audioBackendChanged();
     void multiThreadedPlaybackEnabledChanged();
@@ -161,6 +166,7 @@ class SettingsService : public QObject
     int m_velocity;
     int m_visibleLines;
     int m_trackHeaderFontSize;
+    bool m_autoTrackCount;
 
     bool m_recordingEnabled;
     int m_audioBackend;

src/infra/settings.cpp

@@ -58,6 +58,7 @@ const auto velocityKey = "velocity";
 
 const auto trackHeaderFontSizeKey = "trackHeaderFontSize";
 const auto uiUpdatesDisabledDuringPlaybackKey = "uiUpdatesDisabledDuringPlayback";
+const auto autoTrackCountKey = "autoTrackCount";
 const auto visibleLinesKey = "visibleLines";
 const auto windowSizeKey = "size";
 
@@ -259,6 +260,23 @@ void setVisibleLines(int visibleLines)
     settings.endGroup();
 }
 
+bool autoTrackCount()
+{
+    QSettings settings;
+    settings.beginGroup(settingsGroupEditor);
+    const auto enabled = settings.value(autoTrackCountKey, true).toBool();
+    settings.endGroup();
+    return enabled;
+}
+
+void setAutoTrackCount(bool enabled)
+{
+    QSettings settings;
+    settings.beginGroup(settingsGroupEditor);
+    settings.setValue(autoTrackCountKey, enabled);
+    settings.endGroup();
+}
+
 int trackHeaderFontSize(int defaultTrackHeaderFontSize)
 {
     QSettings settings;

src/infra/settings.hpp

@@ -58,6 +58,10 @@ void setVelocity(int velocity);
 int visibleLines(int defaultVisibleLines);
 void setVisibleLines(int visibleLines);
 
+bool autoTrackCount();
+void setAutoTrackCount(bool autoTrackCount);
+
+
 int trackHeaderFontSize(int defaultTrackHeaderFontSize);
 void setTrackHeaderFontSize(int trackHeaderFontSize);
 

src/view/qml/Dialogs/SettingsDialog_GeneralSettings.qml

@@ -31,7 +31,7 @@ GroupBox {
             Layout.fillWidth: true
             GridLayout {
                 columns: 9
-                rows: 5
+                rows: 6
                 width: parent.width
                 Label {
                     text: qsTr("Number of lines visible:")
@@ -155,6 +155,26 @@ GroupBox {
                     ToolTip.visible: hovered
                     ToolTip.text: qsTr("Width of a drawn automation curve, in pixels")
                 }
+                Label {
+                    text: qsTr("Auto Track Count:")
+                    Layout.column: 0
+                    Layout.columnSpan: 2
+                    Layout.row: 5
+                    Layout.fillWidth: true
+                }
+                CheckBox {
+                    id: autoTrackCountCheckBox
+                    Layout.column: 4
+                    Layout.columnSpan: 5
+                    Layout.row: 5
+                    Layout.fillWidth: true
+                    checked: settingsService.autoTrackCount
+                    onCheckedChanged: settingsService.setAutoTrackCount(checked)
+                    ToolTip.delay: Constants.toolTipDelay
+                    ToolTip.timeout: Constants.toolTipTimeout
+                    ToolTip.visible: hovered
+                    ToolTip.text: qsTr("Automatically adjust the number of visible tracks based on window width")
+                }
             }
         }
 

src/view/qml/Editor/EditorView.qml

@@ -134,8 +134,12 @@ FocusScope {
     // The track area is what the columns actually share, so a narrow window shows fewer of them
     // instead of squeezing all six into headers too small to read.
     function _updateVisibleUnitCount() {
-        const fitting = Math.floor(trackArea.width / Constants.minUnitWidth);
-        editorService.setVisibleUnitCount(Math.max(Constants.minVisibleUnitCount, Math.min(Constants.maxVisibleUnitCount, fitting)));
+        if (settingsService.autoTrackCount) {
+            const fitting = Math.floor(trackArea.width / Constants.minUnitWidth);
+            editorService.setVisibleUnitCount(Math.max(Constants.minVisibleUnitCount, Math.min(Constants.maxVisibleUnitCount, fitting)));
+        } else {
+            editorService.setVisibleUnitCount(Constants.maxVisibleUnitCount);
+        }
     }
     function _setTrackDimensions(track) {
         const unitWidth = trackArea.width / editorService.visibleUnitCount();
@@ -347,6 +351,10 @@ FocusScope {
         mixerService.cleared.connect(_clearMixerSettings);
         UiService.deleteUnusedPatternsConfirmed.connect(deleteUnusedPatterns);
         mouseHandler.editorFocusRequested.connect(forceActiveFocus);
+        settingsService.autoTrackCountChanged.connect(() => {
+            _updateVisibleUnitCount();
+            _updateAllTrackDimensions();
+        });
     }
     function _lineNumberColumnHeight() {
         return trackArea.height - Constants.trackHeaderHeight - Constants.columnHeaderHeight;