Mercurial > hg > easaier-soundaccess

changeset 152:46688275b5d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correct a stupid bug in SDLWidget
author benoitrigolleau
date Thu, 15 Nov 2007 09:19:15 +0000
parents f2d2c1084e7c
children 98df77b4f041
files data/model/SDLWidget.cpp sv/main/MainWindow.cpp
diffstat 2 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/SDLWidget.cpp	Wed Nov 14 17:27:42 2007 +0000
+++ b/data/model/SDLWidget.cpp	Thu Nov 15 09:19:15 2007 +0000
@@ -11,7 +11,7 @@
 	{
 		setAttribute(Qt::WA_PaintOnScreen);
 		setAttribute(Qt::WA_NoSystemBackground);
-		zoomFactor = 1;
+		m_zoomFactor = 1;
 		connect(this,SIGNAL(initSizeChanged()),this,SLOT(updateMinSize()));
 
 	}
@@ -30,8 +30,8 @@
 
 	m_zoomFactor = f;
 
-	w = m_width*zoomFactor;
-	h = m_height*zoomFactor;
+	w = m_width*m_zoomFactor;
+	h = m_height*m_zoomFactor;
 	setMinimumSize( w, h );
 	emit(sizeChanged(w,h));
 	emit(zoomfactorChanged(f));
@@ -46,11 +46,6 @@
 {
 	float f;
 
-	/*if(event->delta()>0){
-		f = zoomFactor*2;
-	}else{
-		f = zoomFactor/2;
-	}*/
 	f = m_zoomFactor + 0.001*event->delta();
 
 	if( f < 32.0/m_width ){
--- a/sv/main/MainWindow.cpp	Wed Nov 14 17:27:42 2007 +0000
+++ b/sv/main/MainWindow.cpp	Thu Nov 15 09:19:15 2007 +0000
@@ -2338,7 +2338,6 @@
 {
     QString path = getOpenFileName(FileFinder::VideoFile);
 
-//TODO : find a better way to fix the widget video bug.
     if (path != "") {
 		if (openVideoFile(path, ReplaceMainModel) == FileOpenFailed) {
 			QMessageBox::critical(this, tr("Failed to open file"),