Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 Dec 30, 2015
1 parent 766bfa1 commit 4c24792
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgstipgui.cpp
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgstipgui.h
Expand Up @@ -24,7 +24,7 @@ class APP_EXPORT QgsTipGui : public QDialog, private Ui::QgsTipGuiBase
{
Q_OBJECT
public:
QgsTipGui();
QgsTipGui( QWidget *parent = nullptr );
~QgsTipGui();

private:
Expand Down

0 comments on commit 4c24792

Please sign in to comment.