-rw-r--r-- | libopie2/opiemm/oimagescrollview.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp index 3f2699a..72248c1 100644 --- a/libopie2/opiemm/oimagescrollview.cpp +++ b/libopie2/opiemm/oimagescrollview.cpp | |||
@@ -45,9 +45,9 @@ OImageScrollView::OImageScrollView (const QImage&img, QWidget * parent, const ch | |||
45 | m_states[IMAGE_IS_JPEG]=false; | 45 | m_states[IMAGE_IS_JPEG]=false; |
46 | m_states[IMAGE_SCALED_LOADED]=false; | 46 | m_states[IMAGE_SCALED_LOADED]=false; |
47 | m_states[SHOW_ZOOMER]=true; | 47 | m_states[SHOW_ZOOMER]=true; |
48 | _original_data.convertDepth(QPixmap::defaultDepth()); | 48 | _original_data.convertDepth(QPixmap::defaultDepth()); |
49 | //_original_data.setAlphaBuffer(false); | 49 | _original_data.setAlphaBuffer(false); |
50 | init(); | 50 | init(); |
51 | } | 51 | } |
52 | 52 | ||
53 | OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) | 53 | OImageScrollView::OImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) |
@@ -69,9 +69,9 @@ void OImageScrollView::setImage(const QImage&img) | |||
69 | { | 69 | { |
70 | _image_data = QImage(); | 70 | _image_data = QImage(); |
71 | _original_data=img; | 71 | _original_data=img; |
72 | _original_data.convertDepth(QPixmap::defaultDepth()); | 72 | _original_data.convertDepth(QPixmap::defaultDepth()); |
73 | //_original_data.setAlphaBuffer(false); | 73 | _original_data.setAlphaBuffer(false); |
74 | m_lastName = ""; | 74 | m_lastName = ""; |
75 | setImageIsJpeg(false); | 75 | setImageIsJpeg(false); |
76 | setImageScaledLoaded(false); | 76 | setImageScaledLoaded(false); |
77 | if (FirstResizeDone()) { | 77 | if (FirstResizeDone()) { |
@@ -126,9 +126,9 @@ void OImageScrollView::setImage( const QString& path ) { | |||
126 | } else { | 126 | } else { |
127 | setImageIsJpeg(false); | 127 | setImageIsJpeg(false); |
128 | _original_data.load(path); | 128 | _original_data.load(path); |
129 | _original_data.convertDepth(QPixmap::defaultDepth()); | 129 | _original_data.convertDepth(QPixmap::defaultDepth()); |
130 | //_original_data.setAlphaBuffer(false); | 130 | _original_data.setAlphaBuffer(false); |
131 | } | 131 | } |
132 | _image_data = QImage(); | 132 | _image_data = QImage(); |
133 | if (FirstResizeDone()) { | 133 | if (FirstResizeDone()) { |
134 | generateImage(); | 134 | generateImage(); |
@@ -400,10 +400,11 @@ void OImageScrollView::generateImage() | |||
400 | } | 400 | } |
401 | 401 | ||
402 | void OImageScrollView::resizeEvent(QResizeEvent * e) | 402 | void OImageScrollView::resizeEvent(QResizeEvent * e) |
403 | { | 403 | { |
404 | odebug << "OImageScrollView resizeEvent" << oendl; | 404 | odebug << "OImageScrollView resizeEvent (" << e->size() << " - " << e->oldSize() << oendl; |
405 | QScrollView::resizeEvent(e); | 405 | QScrollView::resizeEvent(e); |
406 | if (e->oldSize()==e->size()||!isUpdatesEnabled ()) return; | ||
406 | generateImage(); | 407 | generateImage(); |
407 | setFirstResizeDone(true); | 408 | setFirstResizeDone(true); |
408 | emit viewportSizeChanged( viewport()->size() ); | 409 | emit viewportSizeChanged( viewport()->size() ); |
409 | 410 | ||