2 files changed, 26 insertions, 5 deletions

diff --git a/noncore/graphics/opie-eye/lib/oimagezoomer.cpp b/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
index 00b93e2..d1eec67 100644
--- a/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
+++ b/noncore/graphics/opie-eye/lib/oimagezoomer.cpp
@@ -1,8 +1,10 @@
 #include "oimagezoomer.h"
 
+#include <opie2/odebug.h>
+
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qrect.h>
 #include <qpoint.h>
 #include <qsize.h>
@@ -83,12 +85,13 @@ OImageZoomer::OImageZoomer( const QSize& pSize, const QSize& vSize, QWidget* par
  */
 OImageZoomer::~OImageZoomer() {
 
 }
 
 void OImageZoomer::init() {
+    m_mevent = false;
     setFrameStyle( Panel | Sunken );
 }
 
 
 /**
  * \brief set the page/image size
@@ -192,26 +195,37 @@ void OImageZoomer::drawContents( QPainter* p ) {
     int h = (c.height()*m_visSize.height() )/len + c.y();
     if ( h > c.height() ) h = c.height();
 
     p->drawRect( x, y, w, h );
 }
 
-void OImageZoomer::mousePressEvent( QMouseEvent*  ) {
+void OImageZoomer::mousePressEvent( QMouseEvent*ev) {
     m_mouseX = m_mouseY = -1;
+    m_mevent = true;
+}
+
+void OImageZoomer::mouseReleaseEvent( QMouseEvent*ev) {
+    if (!m_mevent) return;
+    int mx, my;
+    mx = ev->x();
+    my = ev->y();
+    int diffx = (mx) * m_imgSize.width() / width();
+    int diffy = (my) * m_imgSize.height() / height();
+    emit zoomArea(diffx,diffy);
 }
 
 void OImageZoomer::mouseMoveEvent( QMouseEvent* ev ) {
     int mx, my;
     mx = ev->x();
     my = ev->y();
 
     if ( m_mouseX != -1 && m_mouseY != -1 ) {
+        m_mevent = false;
         int diffx = ( mx - m_mouseX ) * m_imgSize.width() / width();
         int diffy = ( my - m_mouseY ) * m_imgSize.height() / height();
         emit zoomAreaRel( diffx, diffy );
-        emit zoomArea(m_visPt.x()+diffx, m_visPt.y()+diffy );
     }
     m_mouseX = mx;
     m_mouseY = my;
 }
 
 
diff --git a/noncore/graphics/opie-eye/lib/oimagezoomer.h b/noncore/graphics/opie-eye/lib/oimagezoomer.h
index 2516c61..0b356c9 100644
--- a/noncore/graphics/opie-eye/lib/oimagezoomer.h
+++ b/noncore/graphics/opie-eye/lib/oimagezoomer.h
@@ -68,13 +68,14 @@ signals:
      * @see QScrollView::scrollBy
      */
     void zoomAreaRel( int x,int y);
 
     /**
      * Here you get absolute coordinates.
-     * This slot will be emitted from within the mouseMoveEvent of this widget.
+     * This slot will be emitted from within the mouseReleaseEvent of this widget.
+     * if no mouse move where done.
      * So you may not delete this widget
      *
      * @param x The absolute X Coordinate to scroll to.
      * @param y The absolute Y Coordinate to scroll to.
      *
      */
@@ -95,28 +96,34 @@ protected:
     void drawContents( QPainter* p );
 
     /**
      * make sure to call these if you reimplememt
      * @internal
      */
-    void mousePressEvent( QMouseEvent* ev );
+    virtual void mousePressEvent( QMouseEvent* ev );
     /**
      * make sure to call these if you reimplement
      * @internal
      */
-    void mouseMoveEvent( QMouseEvent* ev );
+    virtual void mouseMoveEvent( QMouseEvent* ev );
+    /**
+     * make sure to call these if you reimplement
+     * @internal
+     */
+    virtual void mouseReleaseEvent( QMouseEvent* ev );
 
 private:
     /**
      * @internal
      */
     void init();
     QImage m_img;
     QSize m_imgSize, m_visSize;
     QPoint m_visPt;
     int m_mouseX, m_mouseY;
+    bool m_mevent;
 };
 
 /**
  * This slot is present for convience. You can connect the
  * QScrollView::contentsMoved to this slot and it calls the QPoint
  * version for you