Skip to content
Permalink
Browse files

initialize the tip window with the correct parent

eliminates the extra icon in the taskbar (fixes #8365)
establishes correct modal behaviour (fixes #8312)
  • Loading branch information
SebDieBln committed Nov 28, 2015
1 parent 766bfa1 commit 4c24792b42bda83f9b8219ab806e1d29756aa3cb
Showing with 6 additions and 6 deletions.
  1. +1 −1 src/app/qgisapp.cpp
  2. +4 −4 src/app/qgstipgui.cpp
  3. +1 −1 src/app/qgstipgui.h
@@ -908,7 +908,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
if ( settings.value( QString( "/qgis/showTips%1" ).arg( QGis::QGIS_VERSION_INT / 100 ), true ).toBool() )
{
mSplash->hide();
QgsTipGui myTip;
QgsTipGui myTip( this );
myTip.exec();
}
else
@@ -24,11 +24,11 @@
#include <qgstipfactory.h>

#ifdef Q_OS_MACX
QgsTipGui::QgsTipGui()
: QDialog( nullptr, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only
QgsTipGui::QgsTipGui( QWidget *parent )
: QDialog( parent, Qt::WindowSystemMenuHint ) // Dialog with close button only
#else
QgsTipGui::QgsTipGui()
: QDialog( nullptr ) // Normal dialog in non Mac-OS
QgsTipGui::QgsTipGui( QWidget *parent )
: QDialog( parent ) // Normal dialog in non Mac-OS
#endif
{
setupUi( this );
@@ -24,7 +24,7 @@ class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
{
Q_OBJECT
public:
QgsTipGui();
QgsTipGui( QWidget *parent = nullptr );
~QgsTipGui();

private:

0 comments on commit 4c24792

Please sign in to comment.
You can’t perform that action at this time.