diff --git a/app/PlaYUVerMdiSubWindow.h b/app/PlaYUVerMdiSubWindow.h index dc0f3c9..3b47bbe 100644 --- a/app/PlaYUVerMdiSubWindow.h +++ b/app/PlaYUVerMdiSubWindow.h @@ -49,7 +49,6 @@ Q_SIGNALS: protected: QSize sizeHint() const; void closeEvent( QCloseEvent *event ); - }; } // NAMESPACE diff --git a/app/SubWindowHandle.cpp b/app/SubWindowHandle.cpp index e3709ee..4277667 100644 --- a/app/SubWindowHandle.cpp +++ b/app/SubWindowHandle.cpp @@ -39,8 +39,8 @@ SubWindowHandle::SubWindowHandle( QWidget * parent, UInt category ) : setWindowIcon( QIcon( ":/images/playuver.png" ) ); // Create a new scroll area inside the sub-window - connect( horizontalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValue() ) ); - connect( verticalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValue() ) ); + connect( horizontalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValues() ) ); + connect( verticalScrollBar(), SIGNAL( actionTriggered( int ) ), this, SLOT( updateCurScrollValues() ) ); setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff ); @@ -75,13 +75,11 @@ Void SubWindowHandle::adjustScrollBarByOffset( QPoint Offset ) m_cCurrScroll.setX(int( cLastScroll.x() + Offset.x() )); m_cCurrScroll.setY(int( cLastScroll.y() + Offset.y() )); - if(!widget()->visibleRegion().isEmpty()) - { - QScrollBar *scrollBar = horizontalScrollBar(); - scrollBar->setValue( m_cCurrScroll.x() ); - scrollBar = verticalScrollBar(); - scrollBar->setValue( m_cCurrScroll.y() ); - } + // Update window scroll + QScrollBar *scrollBar = horizontalScrollBar(); + scrollBar->setValue( m_cCurrScroll.x() ); + scrollBar = verticalScrollBar(); + scrollBar->setValue( m_cCurrScroll.y() ); } // This function was developed with help of the schematics presented in @@ -121,18 +119,15 @@ Void SubWindowHandle::adjustScrollBarByScale( Double scale, QPoint center ) m_cCurrScroll.setY(value); } - if(!widget()->visibleRegion().isEmpty()) - { - scrollBar = horizontalScrollBar(); - scrollBar->setValue( m_cCurrScroll.x() ); - scrollBar = verticalScrollBar(); - scrollBar->setValue( m_cCurrScroll.y() ); - } + // Update window scroll + scrollBar = horizontalScrollBar(); + scrollBar->setValue( m_cCurrScroll.x() ); + scrollBar = verticalScrollBar(); + scrollBar->setValue( m_cCurrScroll.y() ); - update(); } -Void SubWindowHandle::updateCurScrollValue() +Void SubWindowHandle::updateCurScrollValues() { QScrollBar *scrollBar = horizontalScrollBar(); m_cCurrScroll.setX( scrollBar->value() ); diff --git a/app/SubWindowHandle.h b/app/SubWindowHandle.h index 2d77016..e0f9d6d 100644 --- a/app/SubWindowHandle.h +++ b/app/SubWindowHandle.h @@ -138,7 +138,7 @@ public Q_SLOTS: void onDestroyed(); void adjustScrollBarByScale( double scale, QPoint center ); void adjustScrollBarByOffset( QPoint Offset ); - void updateCurScrollValue(); + void updateCurScrollValues(); void setCurScrollValues(); }; diff --git a/app/ViewArea.cpp b/app/ViewArea.cpp index 3c68a53..478b13e 100644 --- a/app/ViewArea.cpp +++ b/app/ViewArea.cpp @@ -49,8 +49,6 @@ static const QColor eraserColor = Qt::red; ViewArea::ViewArea( QWidget *parent ) : QWidget( parent ) { - setAttribute( Qt::WA_StaticContents ); -// setAttribute( Qt::WA_NoBackground ); setMouseTracking( true ); m_pcCurrFrame = NULL;