napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamaresui] Look up icons via theme

Browse Source 
- Don't cache icons, because they could be changed via
   the active desktop theme.
This commit is contained in:
Adriaan de Groot 2019-05-27 15:35:56 +02:00
parent 822bbaad9c
commit 976ad7e3e7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libcalamaresui/Branding.cpp
View File

@ -297,15 +297,21 @@ Branding::imagePath( Branding::ImageEntry imageEntry ) const
QPixmap QPixmap
Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const
{ {
QPixmap pixmap = const auto path = imagePath( imageEntry );
ImageRegistry::instance()->pixmap( imagePath( imageEntry ), size ); if ( path.contains( '/' ) )
if ( pixmap.isNull() )
{ {
Q_ASSERT( false ); QPixmap pixmap = ImageRegistry::instance()->pixmap( path, size );
return QPixmap();
Q_ASSERT( !pixmap.isNull() );
return pixmap;
}
else
{
auto icon = QIcon::fromTheme(path);
Q_ASSERT( !icon.isNull() );
return icon.pixmap( size );
} }
return pixmap;
} }
QString QString