diff options
| author | David Lönnhager <david.l@mullvad.net> | 2025-05-13 12:35:53 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2025-05-13 12:35:53 +0200 |
| commit | 34a2cb183a95648d9080c562f4bad2cbd31ab557 (patch) | |
| tree | c12775a60e185e4ee99ebefa329a10e41a2cb9fc | |
| parent | 0495cf709f8a92f7ad73d47746f4b13bd699678e (diff) | |
| parent | 55ac511db7a47e2d847a7fdb1c182700f3f83306 (diff) | |
| download | mullvadvpn-34a2cb183a95648d9080c562f4bad2cbd31ab557.tar.xz mullvadvpn-34a2cb183a95648d9080c562f4bad2cbd31ab557.zip | |
Merge branch 'fix-installer-downloader-arrow'
| -rw-r--r-- | installer-downloader/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | installer-downloader/src/winapi_impl/ui.rs | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/installer-downloader/CHANGELOG.md b/installer-downloader/CHANGELOG.md index 6415407845..760db3eb06 100644 --- a/installer-downloader/CHANGELOG.md +++ b/installer-downloader/CHANGELOG.md @@ -21,6 +21,10 @@ Line wrap the file at 100 chars. Th ## [Unreleased] +### Fixed +#### Windows +- Use default font instead of Segoe Fluent Icons for back arrow. + ## [0.3.0] - 2025-05-06 ### Added diff --git a/installer-downloader/src/winapi_impl/ui.rs b/installer-downloader/src/winapi_impl/ui.rs index 79e91de915..c6685ac1fb 100644 --- a/installer-downloader/src/winapi_impl/ui.rs +++ b/installer-downloader/src/winapi_impl/ui.rs @@ -70,8 +70,6 @@ pub struct AppWindow { pub beta_prefix: nwg::Label, pub beta_link: nwg::Label, - pub arrow_font: nwg::Font, - pub stable_message_frame: nwg::ImageFrame, pub stable_prefix: nwg::Label, pub stable_link: nwg::Label, @@ -226,15 +224,10 @@ impl AppWindow { .size((240, 24)) .build(&mut self.stable_message_frame)?; - nwg::Font::builder() - .family("Segoe Fluent Icons") - .size(10) - .build(&mut self.arrow_font)?; nwg::Label::builder() .parent(&self.stable_message_frame) .size((16, 24)) - .text("") - .font(Some(&self.arrow_font)) + .text("←") .h_align(nwg::HTextAlign::Left) .build(&mut self.stable_prefix)?; nwg::Label::builder() @@ -288,7 +281,7 @@ impl AppWindow { self.window.size().1 as i32 - 24 - self.stable_message_frame.size().1 as i32, ); self.stable_link.set_position(16, 0); - self.stable_prefix.set_position(4, 12 - 4); + self.stable_prefix.set_position(0, 0); handle_link_messages( &self.stable_message_frame.handle, &self.stable_prefix, |