Remove more unneeded composer window code

qgis · Mar 21, 2017 · 9be22e1 · 9be22e1
1 parent c60a73c
commit 9be22e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 21 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -465,8 +465,6 @@ QgsComposer::QgsComposer( QgsComposition *composition )
   menuBar()->addMenu( mHelpMenu );
 #endif
 
-  mFirstTime = true;
-
   setMouseTracking( true );
   mViewFrame->setMouseTracking( true );
 
@@ -816,23 +814,11 @@ void QgsComposer::connectOtherSlots()
 
 void QgsComposer::open()
 {
-  if ( mFirstTime )
-  {
-    //mComposition->createDefault();
-    mFirstTime = false;
-    show();
-    zoomFull(); // zoomFull() does not work properly until we have called show()
-    if ( mView )
-    {
-      mView->updateRulers();
-    }
-  }
-
-  else
+  show();
+  zoomFull(); // zoomFull() does not work properly until we have called show()
+  if ( mView )
   {
-    show(); //make sure the window is displayed - with a saved project, it's possible to not have already called show()
-    //is that a bug?
-    activate(); //bring the composer window to the front
+    mView->updateRulers();
   }
 }
 

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -550,9 +550,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     //! Pointer to QGIS application
     QgisApp *mQgis = nullptr;
 
-    //! The composer was opened first time (-> set defaults)
-    bool mFirstTime;
-
     //! Layout
     QGridLayout *mItemOptionsLayout = nullptr;