applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 19:05:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[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
Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const
{
QPixmap pixmap =
ImageRegistry::instance()->pixmap( imagePath( imageEntry ), size );
if ( pixmap.isNull() )
const auto path = imagePath( imageEntry );
if ( path.contains( '/' ) )
{
Q_ASSERT( false );
return QPixmap();
QPixmap pixmap = ImageRegistry::instance()->pixmap( path, size );
Q_ASSERT( !pixmap.isNull() );
return pixmap;
}
else
{
auto icon = QIcon::fromTheme(path);
Q_ASSERT( !icon.isNull() );
return icon.pixmap( size );
}
return pixmap;
}
QString