[Libreoffice-commits] core.git: Branch 'feature/priorities' - dbaccess/source

[Jennifer Liebel]

 dbaccess/source/ui/inc/JoinTableView.hxx         |    2 +-
 dbaccess/source/ui/querydesign/JoinTableView.cxx |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 3eb679960b66c5094fbd68372418fd9ba3ba9033
Author: Jennifer Liebel <jliebel94 at gmail.com>
Date:   Mon Nov 17 12:41:33 2014 +0000

    idle to timer
    
    Change-Id: I4862cbdb224a90c156a0c59b131ed94bf6f0d7f1

diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index a14be0d..c9c5002 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -85,7 +85,7 @@ namespace dbaui
         OTableWindowMap     m_aTableMap;
         ::std::vector<OTableConnection*>    m_vTableConnection;
 
-        Idle                m_aDragScrollIdle;
+        Timer               m_aDragScrollTimer;
         Rectangle           m_aDragRect;
         Rectangle           m_aSizingRect;
         Point               m_aDragOffset;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 29b64ef..2944efc 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -169,7 +169,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
 
     InitColors();
 
-    m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
+    m_aDragScrollTimer.SetTimeoutHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
 }
 
 OJoinTableView::~OJoinTableView()
@@ -717,8 +717,8 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
     {
         if( m_pDragWin )
         {
-            if (m_aDragScrollIdle.IsActive())
-                m_aDragScrollIdle.Stop();
+            if (m_aDragScrollTimer.IsActive())
+                m_aDragScrollTimer.Stop();
 
             // adjust position of child after moving
             // windows are not allowed to leave display range
@@ -777,8 +777,8 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
     }
     else if (rTEvt.IsTrackingCanceled())
     {
-        if (m_aDragScrollIdle.IsActive())
-            m_aDragScrollIdle.Stop();
+        if (m_aDragScrollTimer.IsActive())
+            m_aDragScrollTimer.Stop();
         EndTracking();
     }
     else
@@ -990,8 +990,8 @@ bool OJoinTableView::ScrollWhileDragging()
     OSL_ENSURE(m_pDragWin != NULL, "OJoinTableView::ScrollWhileDragging must not be called when a window is being dragged !");
 
     // kill the timer
-    if (m_aDragScrollIdle.IsActive())
-        m_aDragScrollIdle.Stop();
+    if (m_aDragScrollTimer.IsActive())
+        m_aDragScrollTimer.Stop();
 
     Point aDragWinPos = m_ptPrevDraggingPos - m_aDragOffset;
     Size aDragWinSize = m_pDragWin->GetSizePixel();
@@ -1049,8 +1049,8 @@ bool OJoinTableView::ScrollWhileDragging()
     // resetting timer, if still necessary
     if (bNeedScrollTimer)
     {
-        m_aDragScrollIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
-        m_aDragScrollIdle.Start();
+        m_aDragScrollTimer.SetTimeout(100);
+        m_aDragScrollTimer.Start();
     }
 
     // redraw DraggingRect