Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 9 insertions, 0 deletions

diff --git a/toolkit/crashreporter/client/app/src/ui/crashreporter.png b/toolkit/crashreporter/client/app/src/ui/crashreporter.png
index 5e68bac17c..1ceb540ff0 100644
--- a/toolkit/crashreporter/client/app/src/ui/crashreporter.png
+++ b/toolkit/crashreporter/client/app/src/ui/crashreporter.png
diff --git a/toolkit/crashreporter/client/app/src/ui/windows/window.rs b/toolkit/crashreporter/client/app/src/ui/windows/window.rs
index 7e5e8f3f2a..0188ca8216 100644
--- a/toolkit/crashreporter/client/app/src/ui/windows/window.rs
+++ b/toolkit/crashreporter/client/app/src/ui/windows/window.rs
@@ -84,6 +84,15 @@ pub trait CustomWindowClass: WindowClass {
                     0,
                     win::SWP_NOMOVE | win::SWP_NOSIZE | win::SWP_NOZORDER | win::SWP_FRAMECHANGED,
                 ));
+
+                // For reasons that don't make much sense, icons scale poorly unless set with
+                // `WM_SETICON` (see bug 1891920).
+                let icon = W::icon();
+                if icon != 0 {
+                    // The return value doesn't indicate failures.
+                    win::SendMessageW(hwnd, win::WM_SETICON, win::ICON_SMALL as _, icon);
+                    win::SendMessageW(hwnd, win::WM_SETICON, win::ICON_BIG as _, icon);
+                }
             }
 
             let result = unsafe { W::get(hwnd).as_ref() }