2 files changed, 60 insertions, 49 deletions

diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.cpp b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
index 99fdc51..98054ff 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.cpp
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.cpp
@@ -13,5 +13,4 @@ ImageScrollView::ImageScrollView( QWidget* parent, const char* name,  WFlags f )
 {
     init();
-    qDebug("constructor done");
 }
 
@@ -57,4 +56,5 @@ void ImageScrollView::init()
     odebug << "init " << oendl;
     viewport()->setBackgroundColor(white);
+    setFocusPolicy(QWidget::StrongFocus);
     if (first_resize_done) {
         last_rot = Rotate0;
@@ -255,4 +255,27 @@ void ImageScrollView::resizeEvent(QResizeEvent * e)
 }
 
+void ImageScrollView::keyPressEvent(QKeyEvent * e)
+{
+    if (!e) return;
+    int dx = horizontalScrollBar()->lineStep();
+    int dy = verticalScrollBar()->lineStep();
+    if (e->key()==Qt::Key_Right) {
+        scrollBy(dx,0);
+        e->accept();
+    } else if (e->key()==Qt::Key_Left) {
+        scrollBy(0-dx,0);
+        e->accept();
+    } else if (e->key()==Qt::Key_Up) {
+        scrollBy(0,0-dy);
+        e->accept();
+    } else if (e->key()==Qt::Key_Down) {
+        scrollBy(0,dy);
+        e->accept();
+    } else {
+        e->ignore();
+    }
+    QScrollView::keyPressEvent(e);
+}
+
 void ImageScrollView::drawContents(QPainter * p, int clipx, int clipy, int clipw, int cliph)
 {
@@ -293,21 +316,36 @@ void ImageScrollView::viewportMouseMoveEvent(QMouseEvent* e)
     mx = e->x();
     my = e->y();
-    int diffx = _mouseStartPosX-mx;
-    int diffy = _mouseStartPosY-my;
-    scrollBy(diffx,diffy);
+    if (_mouseStartPosX!=-1 && _mouseStartPosY!=-1) {
+        int diffx = _mouseStartPosX-mx;
+        int diffy = _mouseStartPosY-my;
+#if 0
+        QScrollBar*xbar = horizontalScrollBar();
+        QScrollBar*ybar = verticalScrollBar();
+        if (xbar->value()+diffx>xbar->maxValue()) {
+            diffx = xbar->maxValue()-xbar->value();
+        } else if (xbar->value()+diffx<0) {
+            diffx=0-xbar->value();
+        }
+        if (ybar->value()+diffy>ybar->maxValue()) {
+            diffy = ybar->maxValue()-ybar->value();
+        } else if (ybar->value()+diffy<0) {
+            diffy=0-ybar->value();
+        }
+#endif
+        scrollBy(diffx,diffy);
+    }
     _mouseStartPosX=mx;
     _mouseStartPosY=my;
 }
 
-void ImageScrollView::contentsMouseReleaseEvent ( QMouseEvent * e)
+void ImageScrollView::contentsMousePressEvent ( QMouseEvent * )
 {
-    _mouseStartPosX = e->x();
-    _mouseStartPosY = e->y();
-}
-
-void ImageScrollView::contentsMousePressEvent ( QMouseEvent * e)
-{
-    _mouseStartPosX = e->x();
-    _mouseStartPosY = e->y();
+    /* this marks the beginning of a possible mouse move. Due internal reasons of QT
+       the geometry values here may real differ from that set in MoveEvent (I don't know
+       why). For getting them in real context, we use the first move-event to set the start
+       position ;) 
+    */
+    _mouseStartPosX = -1;
+    _mouseStartPosY = -1;
 }
 
@@ -319,19 +357,2 @@ void ImageScrollView::setDestructiveClose() {
     setWFlags( fl );
 }
-
-
-/* for testing */
-ImageDlg::ImageDlg(const QString&fname,QWidget * parent, const char * name)
-    :QDialog(parent,name,true,WStyle_ContextHelp)
-{
-    QVBoxLayout*dlglayout = new QVBoxLayout(this);
-    dlglayout->setSpacing(2);
-    dlglayout->setMargin(1);
-    ImageScrollView*inf = new ImageScrollView(fname,this);
-    dlglayout->addWidget(inf);
-    odebug << "Imagedlg constructor end" << oendl;
-}
-
-ImageDlg::~ImageDlg()
-{
-}
diff --git a/noncore/graphics/opie-eye/gui/imagescrollview.h b/noncore/graphics/opie-eye/gui/imagescrollview.h
index 44f2a64..17e2f5f 100644
--- a/noncore/graphics/opie-eye/gui/imagescrollview.h
+++ b/noncore/graphics/opie-eye/gui/imagescrollview.h
@@ -18,10 +18,10 @@ public:
     virtual ~ImageScrollView();
 
-    void setImage(const QImage&);
-    void setImage( const QString& path );
-    void setDestructiveClose();
+    virtual void setImage(const QImage&);
+    virtual void setImage( const QString& path );
+    virtual void setDestructiveClose();
 
-    void setAutoRotate(bool);
-    void setAutoScale(bool);
+    virtual void setAutoRotate(bool);
+    virtual void setAutoScale(bool);
 
     enum  Rotation {
@@ -49,24 +49,14 @@ protected:
     Rotation last_rot;
     QString m_lastName;
-    void rescaleImage(int w, int h);
+    virtual void rescaleImage(int w, int h);
 
-    void rotate_into_data(Rotation r);
-    void generateImage();
+    virtual void rotate_into_data(Rotation r);
+    virtual void generateImage();
 
 protected slots:
     virtual void viewportMouseMoveEvent(QMouseEvent* e);
     virtual void contentsMousePressEvent ( QMouseEvent * e);
-    virtual void contentsMouseReleaseEvent ( QMouseEvent * e);
     virtual void resizeEvent(QResizeEvent * e);
+    virtual void keyPressEvent(QKeyEvent * e);
 };
-
-/* for testing */
-class ImageDlg:public QDialog
-{
-    Q_OBJECT
-public:
-    ImageDlg(const QString&,QWidget * parent=0, const char * name=0);
-    virtual ~ImageDlg();
-};
-
 #endif