set doubleclick timeout to 1/2s; further cleanup

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ccc1eb9..29d8d68 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -230,7 +230,7 @@ void MainWindow::statusChanged(RemoteView::RemoteStatus status)
                toolbar->setEnabled(true);
 
                vnc_view->setZoomLevel(zoom_slider->value());
-               vnc_view->forceFullRepaint();
+               vnc_view->repaint();
                break;
        case RemoteView::Disconnecting:
                if(old_status == RemoteView::Disconnected) //Disconnecting also occurs while connecting, so check last state
@@ -376,7 +376,7 @@ void MainWindow::setZoomLevel(int level)
 void MainWindow::zoomSliderReleased()
 {
        static QTime time;
-       if(!time.isNull() and time.elapsed() < 700) //double clicked
+       if(!time.isNull() and time.elapsed() < 500) //double clicked
                zoom_slider->setValue(95); //100%
        
        time.restart();

diff --git a/src/vncview.cpp b/src/vncview.cpp
index 0629241..6d01968 100644 (file)
--- a/src/vncview.cpp
+++ b/src/vncview.cpp
@@ -71,7 +71,6 @@ VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality,
         m_horizontalFactor(1.0),
         m_verticalFactor(1.0),
         m_forceLocalCursor(false),
-       force_full_repaint(false),
        quality(quality),
        listen_port(listen_port)
 {
@@ -105,12 +104,6 @@ VncView::~VncView()
     startQuitting();
 }
 
-void VncView::forceFullRepaint()
-{
-       force_full_repaint = true;
-       repaint();
-}
-
 bool VncView::eventFilter(QObject *obj, QEvent *event)
 {
     if (m_viewOnly) {
@@ -408,7 +401,7 @@ void VncView::paintEvent(QPaintEvent *event)
 
        const QRect update_rect = event->rect();
     QPainter painter(this);
-       if (!force_full_repaint and (update_rect.width() != width() || update_rect.height() != height())) {
+       if (update_rect != rect()) {
                // kDebug(5011) << "Partial repaint";
                const int sx = qRound(update_rect.x()/m_horizontalFactor);
                const int sy = qRound(update_rect.y()/m_verticalFactor);
@@ -422,7 +415,6 @@ void VncView::paintEvent(QPaintEvent *event)
 
                painter.drawImage(rect(),
                                                  m_frame.scaled(size(), Qt::IgnoreAspectRatio, transformation_mode));
-               force_full_repaint = false;
     }
 
        //draw local cursor ourselves, normal mouse pointer doesn't deal with scrolling

diff --git a/src/vncview.h b/src/vncview.h
index 3fb0a2b..d707f31 100644 (file)
--- a/src/vncview.h
+++ b/src/vncview.h
@@ -63,7 +63,6 @@ public slots:
     void sendKey(Qt::Key key);
     void sendKeySequence(QKeySequence keys);
     void startQuitting();
-    void forceFullRepaint();
 
 protected:
     void paintEvent(QPaintEvent *event);
@@ -87,7 +86,6 @@ private:
     qreal m_verticalFactor;
     QImage m_frame;
     bool m_forceLocalCursor;
-    bool force_full_repaint;
     int left_zoom, right_zoom;
     bool disable_tapping;
     RemoteView::Quality quality;