sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Hidpi friendly message bar icon sizes

Browse Source
This commit is contained in:
Nyall Dawson 2018-11-01 16:42:10 +10:00
parent 26c3dd30a9
commit e83aa5a200
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/qgsmessagebar.cpp
View File

@ -44,7 +44,9 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
setFrameShadow( QFrame::Plain ); setFrameShadow( QFrame::Plain );
mLayout = new QGridLayout( this ); mLayout = new QGridLayout( this );
mLayout->setContentsMargins( 9, 1, 9, 1 ); const int xMargin = std::max( 9.0, Qgis::UI_SCALE_FACTOR * fontMetrics().height() * 0.45 );
const int yMargin = std::max( 1.0, Qgis::UI_SCALE_FACTOR * fontMetrics().height() * 0.05 );
mLayout->setContentsMargins( xMargin, yMargin, xMargin, yMargin );
setLayout( mLayout ); setLayout( mLayout );
mCountProgress = new QProgressBar( this ); mCountProgress = new QProgressBar( this );
@ -55,7 +57,9 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
mCountProgress->setStyleSheet( mCountStyleSheet.arg( QStringLiteral( "mIconTimerPause.svg" ) ) ); mCountProgress->setStyleSheet( mCountStyleSheet.arg( QStringLiteral( "mIconTimerPause.svg" ) ) );
mCountProgress->setObjectName( QStringLiteral( "mCountdown" ) ); mCountProgress->setObjectName( QStringLiteral( "mCountdown" ) );
mCountProgress->setFixedSize( 25, 14 ); const int barWidth = std::max( 25.0, Qgis::UI_SCALE_FACTOR * fontMetrics().height() * 1.25 );
const int barHeight = std::max( 14.0, Qgis::UI_SCALE_FACTOR * fontMetrics().height() * 0.7 );
mCountProgress->setFixedSize( barWidth, barHeight );
mCountProgress->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); mCountProgress->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
mCountProgress->setTextVisible( false ); mCountProgress->setTextVisible( false );
mCountProgress->setRange( 0, 5 ); mCountProgress->setRange( 0, 5 );
@ -83,7 +87,9 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
"QToolButton::menu-button { background-color: rgba(0, 0, 0, 0); }" ); "QToolButton::menu-button { background-color: rgba(0, 0, 0, 0); }" );
mCloseBtn->setCursor( Qt::PointingHandCursor ); mCloseBtn->setCursor( Qt::PointingHandCursor );
mCloseBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconClose.svg" ) ) ); mCloseBtn->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconClose.svg" ) ) );
mCloseBtn->setIconSize( QSize( 18, 18 ) );
const int iconSize = std::max( 18.0, Qgis::UI_SCALE_FACTOR * fontMetrics().height() * 0.9 );
mCloseBtn->setIconSize( QSize( iconSize, iconSize ) );
mCloseBtn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ); mCloseBtn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum );
mCloseBtn->setMenu( mCloseMenu ); mCloseBtn->setMenu( mCloseMenu );
mCloseBtn->setPopupMode( QToolButton::MenuButtonPopup ); mCloseBtn->setPopupMode( QToolButton::MenuButtonPopup );

3
src/gui/qgsmessagebaritem.cpp
View File

@ -109,7 +109,8 @@ void QgsMessageBarItem::writeContent()
} }
icon = QgsApplication::getThemeIcon( msgIcon ); icon = QgsApplication::getThemeIcon( msgIcon );
} }
mLblIcon->setPixmap( icon.pixmap( 24 ) ); const int iconSize = std::max( 24.0, fontMetrics().height() * 1.2 );
mLblIcon->setPixmap( icon.pixmap( iconSize ) );
// STYLESHEETS // STYLESHEETS