Diffstat (limited to 'noncore/graphics/opie-eye/gui/imagescrollview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.cpp | 44 |
1 files changed, 35 insertions, 9 deletions
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp index 5b12258..2f16d82 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp +++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp | |||
@@ -9,14 +9,14 @@ using namespace Opie::Core; | |||
9 | 9 | ||
10 | ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f ) | 10 | ImageScrollView::ImageScrollView( QWidget* parent, const char* name, WFlags f ) |
11 | :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true), | 11 | :QScrollView(parent,name,f|Qt::WRepaintNoErase ),_image_data(),_original_data(),scale_to_fit(true), |
12 | rotate_to_fit(true),first_resize_done(false),m_lastName("") | 12 | rotate_to_fit(true),show_zoomer(true),first_resize_done(false),m_lastName("") |
13 | { | 13 | { |
14 | init(); | 14 | init(); |
15 | } | 15 | } |
16 | 16 | ||
17 | ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) | 17 | ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) |
18 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale), | 18 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(img),scale_to_fit(always_scale), |
19 | rotate_to_fit(rfit),first_resize_done(false),m_lastName("") | 19 | rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("") |
20 | { | 20 | { |
21 | _original_data.convertDepth(QPixmap::defaultDepth()); | 21 | _original_data.convertDepth(QPixmap::defaultDepth()); |
22 | _original_data.setAlphaBuffer(false); | 22 | _original_data.setAlphaBuffer(false); |
@@ -25,7 +25,7 @@ ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char | |||
25 | 25 | ||
26 | ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) | 26 | ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f,bool always_scale,bool rfit) |
27 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale), | 27 | :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(),_original_data(),scale_to_fit(always_scale), |
28 | rotate_to_fit(rfit),first_resize_done(false),m_lastName("") | 28 | rotate_to_fit(rfit),show_zoomer(true),first_resize_done(false),m_lastName("") |
29 | { | 29 | { |
30 | init(); | 30 | init(); |
31 | setImage(img); | 31 | setImage(img); |
@@ -80,8 +80,8 @@ void ImageScrollView::init() | |||
80 | if (first_resize_done) { | 80 | if (first_resize_done) { |
81 | last_rot = Rotate0; | 81 | last_rot = Rotate0; |
82 | generateImage(); | 82 | generateImage(); |
83 | odebug << "reinit display " << oendl; | ||
84 | } else if (_original_data.size().isValid()) { | 83 | } else if (_original_data.size().isValid()) { |
84 | if (image_fit_into(_original_data.size()) || !show_zoomer) _zoomer->hide(); | ||
85 | resizeContents(_original_data.width(),_original_data.height()); | 85 | resizeContents(_original_data.width(),_original_data.height()); |
86 | } | 86 | } |
87 | } | 87 | } |
@@ -266,14 +266,21 @@ void ImageScrollView::generateImage() | |||
266 | resizeContents(_image_data.width(),_image_data.height()); | 266 | resizeContents(_image_data.width(),_image_data.height()); |
267 | } | 267 | } |
268 | _pdata.convertFromImage(_image_data); | 268 | _pdata.convertFromImage(_image_data); |
269 | |||
269 | 270 | ||
270 | /* | 271 | /* |
271 | * update the zoomer | 272 | * update the zoomer |
272 | */ | 273 | */ |
274 | check_zoomer(); | ||
273 | emit imageSizeChanged( _image_data.size() ); | 275 | emit imageSizeChanged( _image_data.size() ); |
274 | rescaleImage( 128, 128 ); | 276 | rescaleImage( 128, 128 ); |
277 | /* | ||
278 | * move scrollbar | ||
279 | */ | ||
280 | _zoomer->setGeometry( viewport()->width()-_image_data.width()/2, viewport()->height()-_image_data.height()/2, | ||
281 | _image_data.width()/2, _image_data.height()/2 ); | ||
282 | |||
275 | _zoomer->setImage( _image_data ); | 283 | _zoomer->setImage( _image_data ); |
276 | |||
277 | /* | 284 | /* |
278 | * invalidate | 285 | * invalidate |
279 | */ | 286 | */ |
@@ -288,10 +295,6 @@ void ImageScrollView::resizeEvent(QResizeEvent * e) | |||
288 | first_resize_done = true; | 295 | first_resize_done = true; |
289 | emit viewportSizeChanged( viewport()->size() ); | 296 | emit viewportSizeChanged( viewport()->size() ); |
290 | 297 | ||
291 | /* | ||
292 | * move scrollbar | ||
293 | */ | ||
294 | _zoomer->setGeometry( viewport()->width()-100, viewport()->height()-50, 100, 50 ); | ||
295 | } | 298 | } |
296 | 299 | ||
297 | void ImageScrollView::keyPressEvent(QKeyEvent * e) | 300 | void ImageScrollView::keyPressEvent(QKeyEvent * e) |
@@ -398,3 +401,26 @@ void ImageScrollView::setDestructiveClose() { | |||
398 | fl |= WDestructiveClose; | 401 | fl |= WDestructiveClose; |
399 | setWFlags( fl ); | 402 | setWFlags( fl ); |
400 | } | 403 | } |
404 | |||
405 | bool ImageScrollView::image_fit_into(const QSize&s ) | ||
406 | { | ||
407 | if (s.width()>width()||s.height()>height()) { | ||
408 | return false; | ||
409 | } | ||
410 | return true; | ||
411 | } | ||
412 | |||
413 | void ImageScrollView::setShowZoomer(bool how) | ||
414 | { | ||
415 | show_zoomer = how; | ||
416 | check_zoomer(); | ||
417 | } | ||
418 | |||
419 | void ImageScrollView::check_zoomer() | ||
420 | { | ||
421 | if ( (!show_zoomer||image_fit_into(_pdata.size()) ) && _zoomer->isVisible()) { | ||
422 | _zoomer->hide(); | ||
423 | } else if ( show_zoomer && !image_fit_into(_pdata.size()) && _zoomer->isHidden()){ | ||
424 | _zoomer->show(); | ||
425 | } | ||
426 | } | ||