Mercurial > hg > easaier-soundaccess
changeset 151:f2d2c1084e7c
very good zoom out :P
| author | benoitrigolleau |
|---|---|
| date | Wed, 14 Nov 2007 17:27:42 +0000 |
| parents | c946c19e6329 |
| children | 46688275b5d4 |
| files | data/model/SDLWidget.cpp data/model/SDLWidget.h widgets/QueryResultsWidget.cpp |
| diffstat | 3 files changed, 17 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/data/model/SDLWidget.cpp Wed Nov 14 15:11:46 2007 +0000 +++ b/data/model/SDLWidget.cpp Wed Nov 14 17:27:42 2007 +0000 @@ -25,11 +25,10 @@ { int w, h; - if( f == zoomFactor ) + if( f == m_zoomFactor ) return; - zoomFactor = f; - emit(zoomfactorChanged(f)); + m_zoomFactor = f; w = m_width*zoomFactor; h = m_height*zoomFactor; @@ -47,10 +46,19 @@ { float f; - f = zoomFactor + 0.001*event->delta(); + /*if(event->delta()>0){ + f = zoomFactor*2; + }else{ + f = zoomFactor/2; + }*/ + f = m_zoomFactor + 0.001*event->delta(); + if( f < 32.0/m_width ){ f = 32.0/m_height; } + if((int)(m_width*f)%4){ + f = (m_width*f - (int)(m_width*f)%4)/m_width; + } zoomFivan=f; setZoomFactor( f ); } @@ -65,7 +73,7 @@ void SDLWidget::updateMinSize() { - setMinimumSize( m_width*zoomFactor,m_height*zoomFactor ); + setMinimumSize( m_width*m_zoomFactor,m_height*m_zoomFactor ); }
--- a/data/model/SDLWidget.h Wed Nov 14 15:11:46 2007 +0000 +++ b/data/model/SDLWidget.h Wed Nov 14 17:27:42 2007 +0000 @@ -23,7 +23,7 @@ signals: void sizeChanged(int w, int h); - void zoomfactorChanged(int factor); + void zoomfactorChanged(float factor); void initSizeChanged(); public slots: @@ -43,7 +43,7 @@ void updateMinSize(); private: - float zoomFactor; + float m_zoomFactor; };
--- a/widgets/QueryResultsWidget.cpp Wed Nov 14 15:11:46 2007 +0000 +++ b/widgets/QueryResultsWidget.cpp Wed Nov 14 17:27:42 2007 +0000 @@ -216,6 +216,7 @@ //add preview button QPushButton *buttonPrev = new QPushButton(); + // TODO remove this line buttonPrev->setEnabled(false); buttonPrev->setMaximumSize(68,34); buttonPrev->setMinimumSize(68,34); @@ -230,6 +231,7 @@ // search similar boutton QPushButton *buttonSimilar = new QPushButton(); + // TODO remove this line buttonSimilar->setEnabled(false); buttonSimilar->setMaximumSize(64,34); buttonSimilar->setMinimumSize(64,34);