Skip to content
Permalink
Browse files
Remove more unneeded composer window code
  • Loading branch information
nyalldawson committed Mar 21, 2017
1 parent c60a73c commit 9be22e193876d66632fe9db75aa7e9515f4e9e36
Showing with 4 additions and 21 deletions.
  1. +4 −18 src/app/composer/qgscomposer.cpp
  2. +0 −3 src/app/composer/qgscomposer.h
@@ -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();
}
}

@@ -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;

0 comments on commit 9be22e1

Please sign in to comment.