| -rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.cpp | 22 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/imagescrollview.h | 4 |
2 files changed, 17 insertions, 9 deletions
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp index f36b717..019f376 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp +++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp @@ -1,4 +1,8 @@ #include "imagescrollview.h" +#include <opie2/odebug.h> + +using namespace Opie::Core; + #include <qimage.h> #include <qlayout.h> @@ -11,5 +15,5 @@ ImageScrollView::ImageScrollView (const QImage&img, QWidget * parent, const char ImageScrollView::ImageScrollView (const QString&img, QWidget * parent, const char * name, WFlags f) - :QScrollView(parent,name,f/*|Qt::WRepaintNoErase*/),_image_data(img) + :QScrollView(parent,name,f|Qt::WRepaintNoErase),_image_data(img) { init(); @@ -61,11 +65,13 @@ void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw } +/* using the real geometry points and not the translated points is wanted! */ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) { int mx, my; - viewportToContents( e->x(), e->y(), mx, my ); - - scrollBy(_mouseStartPosX-mx,my-_mouseStartPosY); - + mx = e->x(); + my = e->y(); + int diffx = _mouseStartPosX-mx; + int diffy = _mouseStartPosY-my; + scrollBy(diffx,diffy); _mouseStartPosX=mx; _mouseStartPosY=my; @@ -74,10 +80,12 @@ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e) void ImageScrollView::contentsMouseReleaseEvent ( QMouseEvent * e) { - viewportToContents( e->x(), e->y(), _mouseStartPosX,_mouseStartPosY ); + _mouseStartPosX = e->x(); + _mouseStartPosY = e->y(); } void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e) { - viewportToContents( e->x(), e->y(), _mouseStartPosX,_mouseStartPosY ); + _mouseStartPosX = e->x(); + _mouseStartPosY = e->y(); } diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h index 5836c8d..edea235 100644 --- a/noncore/graphics/opie-eye/gui/imagescrollview.h +++ b/noncore/graphics/opie-eye/gui/imagescrollview.h @@ -1,4 +1,4 @@ -#ifndef __IMAGE_SCROLL_VIEW_H -#define __IMAGE_SCROLL_VIEW_H +#ifndef _IMAGE_SCROLL_VIEW_H +#define _IMAGE_SCROLL_VIEW_H #include <qscrollview.h> |