comparison data/model/SDLWidget.cpp @ 152:46688275b5d4

correct a stupid bug in SDLWidget
author benoitrigolleau
date Thu, 15 Nov 2007 09:19:15 +0000
parents f2d2c1084e7c
children 2ac52ea3c1c4
comparison
equal deleted inserted replaced
151:f2d2c1084e7c 152:46688275b5d4
9 SDLWidget::SDLWidget() 9 SDLWidget::SDLWidget()
10 :windowInitialized(false), screen(0),m_width(0), m_height(0) 10 :windowInitialized(false), screen(0),m_width(0), m_height(0)
11 { 11 {
12 setAttribute(Qt::WA_PaintOnScreen); 12 setAttribute(Qt::WA_PaintOnScreen);
13 setAttribute(Qt::WA_NoSystemBackground); 13 setAttribute(Qt::WA_NoSystemBackground);
14 zoomFactor = 1; 14 m_zoomFactor = 1;
15 connect(this,SIGNAL(initSizeChanged()),this,SLOT(updateMinSize())); 15 connect(this,SIGNAL(initSizeChanged()),this,SLOT(updateMinSize()));
16 16
17 } 17 }
18 18
19 SDLWidget::~SDLWidget() 19 SDLWidget::~SDLWidget()
28 if( f == m_zoomFactor ) 28 if( f == m_zoomFactor )
29 return; 29 return;
30 30
31 m_zoomFactor = f; 31 m_zoomFactor = f;
32 32
33 w = m_width*zoomFactor; 33 w = m_width*m_zoomFactor;
34 h = m_height*zoomFactor; 34 h = m_height*m_zoomFactor;
35 setMinimumSize( w, h ); 35 setMinimumSize( w, h );
36 emit(sizeChanged(w,h)); 36 emit(sizeChanged(w,h));
37 emit(zoomfactorChanged(f)); 37 emit(zoomfactorChanged(f));
38 38
39 /*QWidget *p = dynamic_cast<QWidget*>( parent() ); 39 /*QWidget *p = dynamic_cast<QWidget*>( parent() );
44 44
45 void SDLWidget::wheelEvent( QWheelEvent *event ) 45 void SDLWidget::wheelEvent( QWheelEvent *event )
46 { 46 {
47 float f; 47 float f;
48 48
49 /*if(event->delta()>0){
50 f = zoomFactor*2;
51 }else{
52 f = zoomFactor/2;
53 }*/
54 f = m_zoomFactor + 0.001*event->delta(); 49 f = m_zoomFactor + 0.001*event->delta();
55 50
56 if( f < 32.0/m_width ){ 51 if( f < 32.0/m_width ){
57 f = 32.0/m_height; 52 f = 32.0/m_height;
58 } 53 }