adding pattern editor subwindow horizontal scaling

include/MidiClip.h

@@ -108,7 +108,6 @@ class LMMS_EXPORT MidiClip : public Clip
 
 	bool empty();
 
-
 	gui::ClipView * createView( gui::TrackView * _tv ) override;
 
 

include/TrackContainerView.h

@@ -71,7 +71,7 @@ class TrackContainerView : public QWidget, public ModelView,
 {
 	Q_OBJECT
 public:
-	TrackContainerView( TrackContainer* tc );
+	TrackContainerView(TrackContainer* tc, bool canHorizontalScroll = false);
 	~TrackContainerView() override;
 
 	void saveSettings( QDomDocument & _doc, QDomElement & _this ) override;
@@ -175,7 +175,7 @@ public slots:
 	class scrollArea : public QScrollArea
 	{
 	public:
-		scrollArea( TrackContainerView* parent );
+		scrollArea(TrackContainerView* parent, bool canHorizontalScroll);
 		~scrollArea() override = default;
 
 	protected:

include/TrackContentWidget.h

@@ -155,6 +155,7 @@ public slots:
 private:
 	Track * getTrack();
 	TimePos getPosition( int mouseX );
+	void setMinimumWidthBasedOnClips();
 
 	TrackView * m_trackView;
 

include/TrackView.h

@@ -98,6 +98,12 @@ class TrackView : public QWidget, public ModelView, public JournallingObject
 		return m_action == Action::Move;
 	}
 
+	// returns getTrackFixedSettingsWidth() + getTrackFixedOperationsWidth()
+	static const int getTrackFixedWidth();
+	// returns the right compact or not compact width
+	static const int getTrackFixedSettingsWidth();
+	static const int getTrackFixedOperationsWidth();
+
 	virtual void update();
 
 	// Create a menu for assigning/creating channels for this track

src/gui/clips/ClipView.cpp

@@ -322,7 +322,7 @@ void ClipView::updateLength()
 {
 	if( fixedClips() )
 	{
-		setFixedWidth( parentWidget()->width() );
+		setFixedWidth(parentWidget()->width());
 	}
 	else
 	{

src/gui/editors/PatternEditor.cpp

@@ -45,7 +45,7 @@ namespace lmms::gui
 
 
 PatternEditor::PatternEditor(PatternStore* ps) :
-	TrackContainerView(ps),
+	TrackContainerView(ps, true),
 	m_ps(ps)
 {
 	setModel(ps);
@@ -79,6 +79,7 @@ void PatternEditor::removeSteps()
 			p->removeSteps();
 		}
 	}
+	realignTracks();
 }
 
 
@@ -192,6 +193,7 @@ void PatternEditor::makeSteps( bool clone )
 			}
 		}
 	}
+	realignTracks();
 }
 
 // Creates a clone of the current pattern track with the same content, but no clips in the song editor
@@ -234,14 +236,7 @@ PatternEditorWindow::PatternEditorWindow(PatternStore* ps) :
 	connect(m_toolBar, SIGNAL(dropped(QDropEvent*)), m_editor, SLOT(dropEvent(QDropEvent*)));
 
 	// TODO: Use style sheet
-	if (ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt())
-	{
-		setMinimumWidth(TRACK_OP_WIDTH_COMPACT + DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + 2 * ClipView::BORDER_WIDTH + 384);
-	}
-	else
-	{
-		setMinimumWidth(TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH + 2 * ClipView::BORDER_WIDTH + 384);
-	}
+	setMinimumWidth(TrackView::getTrackFixedWidth() + 2 * ClipView::BORDER_WIDTH);
 
 	m_playAction->setToolTip(tr("Play/pause current pattern (Space)"));
 	m_stopAction->setToolTip(tr("Stop playback of current pattern (Space)"));
@@ -323,4 +318,4 @@ void PatternEditorWindow::stop()
 }
 
 
-} // namespace lmms::gui
+} // namespace lmms::gui

src/gui/editors/SongEditor.cpp

@@ -89,9 +89,7 @@ SongEditor::SongEditor( Song * song ) :
 	m_rubberBandStartTrackview(0),
 	m_rubberbandStartTimePos(0),
 	m_rubberbandPixelsPerBar(DEFAULT_PIXELS_PER_BAR),
-	m_trackHeadWidth(ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt()==1
-					 ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT
-					 : DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH),
+	m_trackHeadWidth(TrackView::getTrackFixedWidth()),
 	m_selectRegion(false)
 {
 	m_zoomingModel->setParent(this);
@@ -756,9 +754,8 @@ static inline void animateScroll( QScrollBar *scrollBar, int newVal, bool smooth
 
 void SongEditor::updatePosition( const TimePos & t )
 {
-	const bool compactTrackButtons = ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt();
-	const auto widgetWidth = compactTrackButtons ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT : DEFAULT_SETTINGS_WIDGET_WIDTH;
-	const auto trackOpWidth = compactTrackButtons ? TRACK_OP_WIDTH_COMPACT : TRACK_OP_WIDTH;
+	const auto widgetWidth = TrackView::getTrackFixedSettingsWidth();
+	const auto trackOpWidth = TrackView::getTrackFixedOperationsWidth();
 
 	if ((m_song->isPlaying() && m_song->m_playMode == Song::PlayMode::Song)
 							|| m_scrollBack)

src/gui/editors/TrackContainerView.cpp

@@ -74,15 +74,15 @@ void InstrumentLoaderThread::run()
 namespace gui
 {
 
-TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
+TrackContainerView::TrackContainerView(TrackContainer * _tc, bool canHorizontalScroll) :
 	QWidget(),
 	ModelView( nullptr, this ),
 	JournallingObject(),
 	SerializingObjectHook(),
 	m_currentPosition( 0, 0 ),
 	m_tc( _tc ),
 	m_trackViews(),
-	m_scrollArea( new scrollArea( this ) ),
+	m_scrollArea(new scrollArea(this, canHorizontalScroll)),
 	m_ppb( DEFAULT_PIXELS_PER_BAR ),
 	m_rubberBand( new RubberBand( m_scrollArea ) )
 {
@@ -456,12 +456,15 @@ RubberBand *TrackContainerView::rubberBand() const
 
 
 
-TrackContainerView::scrollArea::scrollArea( TrackContainerView * _parent ) :
+TrackContainerView::scrollArea::scrollArea(TrackContainerView * _parent, bool canHorizontalScroll) :
 	QScrollArea( _parent ),
 	m_trackContainerView( _parent )
 {
 	setFrameStyle( QFrame::NoFrame );
-	setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
+	if (canHorizontalScroll == false)
+	{
+		setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	}
 }
 
 

src/gui/tracks/SampleTrackView.cpp

@@ -203,9 +203,7 @@ void SampleTrackView::dropEvent(QDropEvent *de)
 
 	if (type == "samplefile")
 	{
-		int trackHeadWidth = ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt()==1
-				? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT
-				: DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH;
+		int trackHeadWidth = TrackView::getTrackFixedWidth();
 
 		int xPos = de->pos().x() < trackHeadWidth
 				? trackHeadWidth

src/gui/tracks/TrackContentWidget.cpp

@@ -31,16 +31,18 @@
 
 #include "AutomationClip.h"
 #include "Clipboard.h"
+#include "ClipView.h"
 #include "DataFile.h"
 #include "Engine.h"
 #include "GuiApplication.h"
+#include "MidiClip.h"
+#include "MidiClipView.h"
 #include "PatternEditor.h"
 #include "PatternStore.h"
 #include "Song.h"
 #include "SongEditor.h"
 #include "StringPairDrag.h"
 #include "TrackContainerView.h"
-#include "ClipView.h"
 #include "TrackView.h"
 
 namespace lmms::gui
@@ -211,6 +213,7 @@ void TrackContentWidget::removeClipView( ClipView * clipv )
  */
 void TrackContentWidget::update()
 {
+	setMinimumWidthBasedOnClips();
 	for (const auto& clipView : m_clipViews)
 	{
 		clipView->setFixedHeight(height() - 1);
@@ -636,13 +639,29 @@ void TrackContentWidget::paintEvent( QPaintEvent * pe )
 
 
 
+void TrackContentWidget::setMinimumWidthBasedOnClips()
+{
+	// if this is in the pattern editor
+	if (m_trackView->trackContainerView()->fixedClips())
+	{
+		if (m_clipViews.size() > 0)
+		{
+			auto minWidth = static_cast<size_t>(m_clipViews[0]->getClip()->length().getTicks());
+			setMinimumWidth(minWidth);
+			//auto minWidth = static_cast<size_t>(m_clipViews[0]->getClip()->length().nextFullBar());
+			//setMinimumWidth(minWidth * m_trackView->trackContainerView()->pixelsPerBar());
+		}
+	}
+}
 
 /*! \brief Updates the background tile pixmap on size changes.
  *
  * \param resizeEvent the resize event to pass to base class
  */
 void TrackContentWidget::resizeEvent( QResizeEvent * resizeEvent )
 {
+	setMinimumWidthBasedOnClips();
+
 	// Update backgroud
 	updateBackground();
 	// Force redraw

src/gui/tracks/TrackView.cpp

@@ -130,23 +130,40 @@ TrackView::TrackView( Track * track, TrackContainerView * tcv ) :
  */
 void TrackView::resizeEvent( QResizeEvent * re )
 {
-	if( ConfigManager::inst()->value( "ui",
-					  "compacttrackbuttons" ).toInt() )
+	m_trackOperationsWidget.setFixedSize(getTrackFixedOperationsWidth(), height() - 1);
+	m_trackSettingsWidget.setFixedSize(getTrackFixedSettingsWidth(), height() - 1);
+	m_trackContentWidget.setFixedHeight(height());
+}
+
+
+const int TrackView::getTrackFixedWidth()
+{
+	return getTrackFixedSettingsWidth() + getTrackFixedOperationsWidth();
+}
+
+const int TrackView::getTrackFixedSettingsWidth()
+{
+	if(ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt())
 	{
-		m_trackOperationsWidget.setFixedSize( TRACK_OP_WIDTH_COMPACT, height() - 1 );
-		m_trackSettingsWidget.setFixedSize( DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT, height() - 1 );
+		// if compact size
+		return DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT;
 	}
-	else
+	// if not compact
+	return DEFAULT_SETTINGS_WIDGET_WIDTH;
+}
+
+const int TrackView::getTrackFixedOperationsWidth()
+{
+	if(ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt())
 	{
-		m_trackOperationsWidget.setFixedSize( TRACK_OP_WIDTH, height() - 1 );
-		m_trackSettingsWidget.setFixedSize( DEFAULT_SETTINGS_WIDGET_WIDTH, height() - 1 );
+		// if compact size
+		return TRACK_OP_WIDTH_COMPACT;
 	}
-	m_trackContentWidget.setFixedHeight( height() );
+	// if not compact
+	return TRACK_OP_WIDTH;
 }
 
 
-
-
 /*! \brief Update this track View and all its content objects.
  *
  */

src/tracks/MidiClip.cpp

@@ -538,7 +538,6 @@ void MidiClip::removeSteps()
 
 
 
-
 gui::ClipView * MidiClip::createView( gui::TrackView * _tv )
 {
 	return new gui::MidiClipView( this, _tv );