mirror of
https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares
synced 2026-03-13 02:37:39 +00:00
Icon corruption fix
This commit is contained in:
parent
8a2edf30d4
commit
44ba676dc5
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -1,3 +1,9 @@
|
|||||||
|
calamares (3.3.14-0ubuntu21) resolute; urgency=medium
|
||||||
|
|
||||||
|
* Fix icon corruption on the "Users" page (LP: #2139358)
|
||||||
|
|
||||||
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Tue, 10 Mar 2026 12:32:11 -0400
|
||||||
|
|
||||||
calamares (3.3.14-0ubuntu20) resolute; urgency=medium
|
calamares (3.3.14-0ubuntu20) resolute; urgency=medium
|
||||||
|
|
||||||
* Add manual depend on python3-defaults >= 3.14
|
* Add manual depend on python3-defaults >= 3.14
|
||||||
|
|||||||
31
debian/patches/repair-icon-size.patch
vendored
Normal file
31
debian/patches/repair-icon-size.patch
vendored
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
Description: Repair icon-size initially
|
||||||
|
Create pixmap the size of the button, not the size of
|
||||||
|
the label; this might be (re-)scaled to match the eventual
|
||||||
|
button-size, but there are variations in Qt versions when
|
||||||
|
doing that. By using the size of the button, not the label,
|
||||||
|
the size is correct immediately.
|
||||||
|
Author: Adriaan de Groot <groot@kde.org>
|
||||||
|
Origin: https://codeberg.org/Calamares/calamares/commit/c9e49988651a1c7c2881810ec465446a1f96d822
|
||||||
|
Last-Update: 2026-03-10
|
||||||
|
---
|
||||||
|
This patch header follows DEP-3: http://dep.debian.net/deps/dep3
|
||||||
|
--- a/src/modules/users/UsersPage.cpp
|
||||||
|
+++ b/src/modules/users/UsersPage.cpp
|
||||||
|
@@ -38,7 +38,7 @@ static inline void
|
||||||
|
labelError( QLabel* pix, QLabel* label, Calamares::ImageType icon, const QString& message )
|
||||||
|
{
|
||||||
|
label->setText( message );
|
||||||
|
- pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, label->size() ) );
|
||||||
|
+ pix->setPixmap( Calamares::defaultPixmap( icon, Calamares::Original, pix->size() ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @brief Clear error, set happy pixmap on a label to indicate "ok". */
|
||||||
|
@@ -46,7 +46,7 @@ static inline void
|
||||||
|
labelOk( QLabel* pix, QLabel* label )
|
||||||
|
{
|
||||||
|
label->clear();
|
||||||
|
- pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, label->size() ) );
|
||||||
|
+ pix->setPixmap( Calamares::defaultPixmap( Calamares::StatusOk, Calamares::Original, pix->size() ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @brief Sets error or ok on a label depending on @p status and @p value
|
||||||
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -4,3 +4,4 @@ enable-only-present-with-encryption-partitions.patch
|
|||||||
grub-debconf-config.patch
|
grub-debconf-config.patch
|
||||||
unmount-encrypted-devices.patch
|
unmount-encrypted-devices.patch
|
||||||
fix-checkbox-warning-confusion.patch
|
fix-checkbox-warning-confusion.patch
|
||||||
|
repair-icon-size.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user