avoid useless canvas redraw when user interacts with scale selector

qgis · Jan 21, 2012 · 060af36 · 060af36
1 parent 2d8b1ab
commit 060af36
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4444,6 +4444,8 @@ void QgisApp::showScale( double theScale )
   else
     mScaleEdit->setEditText( tr( "Invalid scale" ) );
 
+  mOldScale = mScaleEdit->currentText();
+
   if ( mScaleEdit->width() > mScaleEdit->minimumWidth() )
   {
     mScaleEdit->setMinimumWidth( mScaleEdit->width() );
@@ -4452,6 +4454,11 @@ void QgisApp::showScale( double theScale )
 
 void QgisApp::userScale()
 {
+  if ( mOldScale == mScaleEdit->currentText() )
+  {
+    return;
+  }
+
   QStringList parts = mScaleEdit->currentText().split( ':' );
   if ( parts.size() == 2 )
   {

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -1150,6 +1150,8 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void projectChanged( const QDomDocument & );
 
     bool cmpByText( QAction* a, QAction* b );
+
+    QString mOldScale;
 };
 
 #ifdef ANDROID