Mercurial > hg > easaier-soundaccess

diff data/model/SDLWidget.cpp @ 151:f2d2c1084e7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
very good zoom out :P
author benoitrigolleau
date Wed, 14 Nov 2007 17:27:42 +0000
parents c946c19e6329
children 46688275b5d4
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 );
 }