Rubberband fix for selecting large area in Songeditor (LMMS#5003)

include/SongEditor.h

@@ -75,6 +75,9 @@ class SongEditor : public TrackContainerView
 
 public slots:
  void scrolled( int new_pos );
+ void selectRegionFromPixels(int xStart, int xEnd);
+ void stopSelectRegion();
+ void updateRubberband();
 
  void setEditMode( EditMode mode );
  void setEditModeDraw();
@@ -85,6 +88,9 @@ public slots:
 
 protected:
  virtual void closeEvent( QCloseEvent * ce );
+ virtual void mousePressEvent(QMouseEvent * me);
+ virtual void mouseMoveEvent(QMouseEvent * me);
+ virtual void mouseReleaseEvent(QMouseEvent * me);
 
 private slots:
  void setHighQuality( bool );
@@ -109,6 +115,9 @@ private slots:
 
  virtual bool allowRubberband() const;
 
+ int trackIndexFromSelectionPoint(int yPos);
+ int indexOfTrackView(const TrackView* tv);
+
 
  Song * m_song;
 
@@ -135,6 +144,14 @@ private slots:
  bool m_smoothScroll;
 
  EditMode m_mode;
+ QPoint m_origin;
+ QPoint m_scrollPos;
+ QPoint m_mousePos;
+ int m_rubberBandStartTrackview;
+ MidiTime m_rubberbandStartMidipos;
+ int m_currentZoomingValue;
+ int m_trackHeadWidth;
+ bool m_selectRegion;
 
  friend class SongEditorWindow;
 

include/Track.h

@@ -210,6 +210,12 @@ class TrackContentObjectView : public selectableObject, public ModelView
  {
  return m_tco;
  }
+
+ inline TrackView * getTrackView()
+ {
+ return m_trackView;
+ }
+
  // qproperty access func
  QColor mutedColor() const;
  QColor mutedBackgroundColor() const;
@@ -229,7 +235,7 @@ class TrackContentObjectView : public selectableObject, public ModelView
  // access needsUpdate member variable
  bool needsUpdate();
  void setNeedsUpdate( bool b );
- 
+
 public slots:
  virtual bool close();
  void cut();
@@ -256,10 +262,6 @@ public slots:
 
  float pixelsPerTact();
 
- inline TrackView * getTrackView()
- {
- return m_trackView;
- }
 
  DataFile createTCODataFiles(const QVector<TrackContentObjectView *> & tcos) const;
 

include/TrackContainerView.h

@@ -133,27 +133,21 @@ public slots:
 
  virtual void dropEvent( QDropEvent * _de );
  virtual void dragEnterEvent( QDragEnterEvent * _dee );
- ///
- /// \brief selectRegionFromPixels
- /// \param x
- /// \param y
- /// Use the rubber band to select TCO from all tracks using x, y pixels
- void selectRegionFromPixels(int xStart, int xEnd);
 
  ///
  /// \brief stopRubberBand
  /// Removes the rubber band from display when finished with.
  void stopRubberBand();
 
+
 protected:
  static const int DEFAULT_PIXELS_PER_TACT = 16;
 
- virtual void mousePressEvent( QMouseEvent * _me );
- virtual void mouseMoveEvent( QMouseEvent * _me );
- virtual void mouseReleaseEvent( QMouseEvent * _me );
+
  virtual void resizeEvent( QResizeEvent * );
 
  MidiTime m_currentPosition;
+ RubberBand *rubberBand() const;
 
 
 private:
@@ -187,7 +181,7 @@ public slots:
  float m_ppt;
 
  RubberBand * m_rubberBand;
- QPoint m_origin;
+
 
 
 signals:

src/gui/TrackContainerView.cpp

@@ -55,8 +55,7 @@ TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
  m_trackViews(),
  m_scrollArea( new scrollArea( this ) ),
  m_ppt( DEFAULT_PIXELS_PER_TACT ),
- m_rubberBand( new RubberBand( m_scrollArea ) ),
- m_origin()
+ m_rubberBand( new RubberBand( m_scrollArea ) )
 {
  m_tc->setHook( this );
  //keeps the direction of the widget, undepended on the locale
@@ -346,12 +345,8 @@ void TrackContainerView::dragEnterEvent( QDragEnterEvent * _dee )
  arg( Track::SampleTrack ) );
 }
 
-void TrackContainerView::selectRegionFromPixels(int xStart, int xEnd)
-{
- m_rubberBand->setEnabled( true );
- m_rubberBand->show();
- m_rubberBand->setGeometry( min( xStart, xEnd ), 0, max( xStart, xEnd ) - min( xStart, xEnd ), std::numeric_limits<int>::max() );
-}
+
+
 
 void TrackContainerView::stopRubberBand()
 {
@@ -427,50 +422,18 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 
 
 
-void TrackContainerView::mousePressEvent( QMouseEvent * _me )
-{
- if( allowRubberband() == true )
- {
- m_origin = m_scrollArea->mapFromParent( _me->pos() );
- m_rubberBand->setEnabled( true );
- m_rubberBand->setGeometry( QRect( m_origin, QSize() ) );
- m_rubberBand->show();
- }
- QWidget::mousePressEvent( _me );
-}
-
-
-
-
-void TrackContainerView::mouseMoveEvent( QMouseEvent * _me )
-{
- if( rubberBandActive() == true )
- {
- m_rubberBand->setGeometry( QRect( m_origin,
- m_scrollArea->mapFromParent( _me->pos() ) ).
- normalized() );
- }
- QWidget::mouseMoveEvent( _me );
-}
-
-
-
-
-void TrackContainerView::mouseReleaseEvent( QMouseEvent * _me )
+void TrackContainerView::resizeEvent( QResizeEvent * _re )
 {
- m_rubberBand->hide();
- m_rubberBand->setEnabled( false );
- QWidget::mouseReleaseEvent( _me );
+ realignTracks();
+ QWidget::resizeEvent( _re );
 }
 
 
 
 
-
-void TrackContainerView::resizeEvent( QResizeEvent * _re )
+RubberBand *TrackContainerView::rubberBand() const
 {
- realignTracks();
- QWidget::resizeEvent( _re );
+ return m_rubberBand;
 }