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

Make HiDPI SVG rendering work on Wayland

Browse Source 
Branding SVGs were rendering at 1x on Wayland and then scaling up to the
display DPI, which looks ugly. To get this to work properly we need to
explicitly multiply the devicePixelRatio into the dimensions that
QPixmaps render at, since QPixmap is DPI-unaware.

This probably only takes care of a subset of the problem codepaths, but
at least it makes the sidebar logo and welcome screen work properly.

Signed-off-by: Hector Martin <marcan@marcan.st>
This commit is contained in:
Hector Martin 2023-09-04 14:33:00 +09:00
parent 4b3278058b
commit 15027f40b2
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calamares/CalamaresApplication.cpp
View File

@ -192,7 +192,7 @@ CalamaresApplication::initBranding()
::exit( EXIT_FAILURE );
}
new Calamares::Branding( brandingFile.absoluteFilePath(), this );
new Calamares::Branding( brandingFile.absoluteFilePath(), this, devicePixelRatio() );
}

6
src/libcalamaresui/Branding.cpp
View File

@ -203,12 +203,13 @@ uploadServerFromMap( const QVariantMap& map )
* documentation for details.
*/
Branding::Branding( const QString& brandingFilePath, QObject* parent )
Branding::Branding( const QString& brandingFilePath, QObject* parent, qreal devicePixelRatio )
: QObject( parent )
, m_descriptorPath( brandingFilePath )
, m_slideshowAPI( 1 )
, m_welcomeStyleCalamares( false )
, m_welcomeExpandingLogo( true )
, m_devicePixelRatio( devicePixelRatio )
{
cDebug() << "Using Calamares branding file at" << brandingFilePath;
@ -358,7 +359,8 @@ Branding::image( Branding::ImageEntry imageEntry, const QSize& size ) const
const auto path = imagePath( imageEntry );
if ( path.contains( '/' ) )
{
QPixmap pixmap = ImageRegistry::instance()->pixmap( path, size );
QPixmap pixmap = ImageRegistry::instance()->pixmap( path, size * m_devicePixelRatio );
pixmap.setDevicePixelRatio( m_devicePixelRatio );
Q_ASSERT( !pixmap.isNull() );
return pixmap;

4
src/libcalamaresui/Branding.h
View File

@ -162,7 +162,7 @@ public:
static Branding* instance();
explicit Branding( const QString& brandingFilePath, QObject* parent = nullptr );
explicit Branding( const QString& brandingFilePath, QObject* parent = nullptr, qreal devicePixelRatio = 1.0 );
/** @brief Complete path of the branding descriptor file. */
QString descriptorPath() const { return m_descriptorPath; }
@ -317,6 +317,8 @@ private:
PanelFlavor m_navigationFlavor = PanelFlavor::Widget;
PanelSide m_sidebarSide = PanelSide::Left;
PanelSide m_navigationSide = PanelSide::Bottom;
qreal m_devicePixelRatio;
};
} // namespace Calamares

7
src/libcalamaresui/widgets/FixedAspectRatioLabel.cpp
View File

@ -24,7 +24,9 @@ void
FixedAspectRatioLabel::setPixmap( const QPixmap& pixmap )
{
m_pixmap = pixmap;
QLabel::setPixmap( pixmap.scaled( contentsRect().size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
m_pixmap.setDevicePixelRatio( devicePixelRatio() );
QLabel::setPixmap( m_pixmap.scaled(
contentsRect().size() * m_pixmap.devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
}
@ -32,5 +34,6 @@ void
FixedAspectRatioLabel::resizeEvent( QResizeEvent* event )
{
Q_UNUSED( event )
QLabel::setPixmap( m_pixmap.scaled( contentsRect().size(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
QLabel::setPixmap( m_pixmap.scaled(
contentsRect().size() * m_pixmap.devicePixelRatio(), Qt::KeepAspectRatio, Qt::SmoothTransformation ) );
}