Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
don't set parent of QFontDialog to avoid the stylesheet font (fixes #…
- Loading branch information
Showing
13 changed files
with
56 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,11 +15,11 @@ | |
#include "qgisgui.h" | ||
|
||
#include <QSettings> | ||
#include <QObject> //for tr | ||
#include <QImageWriter> | ||
#include "qgsencodingfiledialog.h" | ||
#include "qgslogger.h" | ||
#include <memory> //for auto_ptr | ||
|
||
#include <QFontDialog> | ||
|
||
|
||
namespace QgisGui | ||
|
@@ -188,4 +188,17 @@ namespace QgisGui | |
return createFileFilter_( longName, glob ); | ||
} | ||
|
||
QFont getFont( bool &ok, const QFont &initial, const QString &title ) | ||
{ | ||
// parent is intentionally not set to 'this' as | ||
// that would make it follow the style sheet font | ||
// see also #12233 and #4937 | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
nyalldawson
Collaborator
|
||
#if defined(Q_OS_MAC) && defined(QT_MAC_USE_COCOA) | ||
// Native Mac dialog works only for Qt Carbon | ||
return QFontDialog::getFont( &ok, initial, 0, title, QFontDialog::DontUseNativeDialog ); | ||
#else | ||
return QFontDialog::getFont( &ok, initial, 0, title ); | ||
#endif | ||
} | ||
|
||
} // end of QgisGui namespace |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
@jef-n what causes this? is it a Qt bug?