diff --git a/.github/actions/cache-desktop-proguard/action.yml b/.github/actions/cache-desktop-proguard/action.yml new file mode 100644 index 0000000..01d7186 --- /dev/null +++ b/.github/actions/cache-desktop-proguard/action.yml @@ -0,0 +1,18 @@ +name: Cache desktop ProGuard jars +description: Restore or save the CI ProGuard export directory (speeds up release desktop-proguard job) + +outputs: + cache-hit: + description: Whether ProGuard jars were restored from cache + value: ${{ steps.cache.outputs.cache-hit }} + +runs: + using: composite + steps: + - uses: actions/cache@v5 + id: cache + with: + path: app/desktop/build/ci/proguard + key: desktop-proguard-v1-${{ hashFiles('gradle/libs.versions.toml', 'build.gradle.kts', 'settings.gradle.kts', 'app/desktop/build.gradle.kts', 'app/desktop/proguard-rules.pro', 'app/shared/build.gradle.kts') }} + restore-keys: | + desktop-proguard-v1- diff --git a/app/desktop/windows-setup/helper/src/main.rs b/app/desktop/windows-setup/helper/src/main.rs index 545adcd..e2e69b0 100644 --- a/app/desktop/windows-setup/helper/src/main.rs +++ b/app/desktop/windows-setup/helper/src/main.rs @@ -280,6 +280,3 @@ fn parse_edition(raw: &str) -> Result { } } -fn find_app_exe(dest: &PathBuf) -> Result { - find_jpackage_app_exe(dest) -} diff --git a/app/desktop/windows-setup/setup/Cargo.toml b/app/desktop/windows-setup/setup/Cargo.toml index 6900990..93122c4 100644 --- a/app/desktop/windows-setup/setup/Cargo.toml +++ b/app/desktop/windows-setup/setup/Cargo.toml @@ -26,6 +26,10 @@ image = { version = "0.25", default-features = false, features = ["png"] } earcutr = "0.4" raw-window-handle = "0.6" +[lints.rust] +dead_code = "allow" +unused_assignments = "warn" + [build-dependencies] winres = "0.1" image = { version = "0.25", default-features = false, features = ["png"] } diff --git a/app/desktop/windows-setup/setup/src/anim.rs b/app/desktop/windows-setup/setup/src/anim.rs index 739702f..b7faeaa 100644 --- a/app/desktop/windows-setup/setup/src/anim.rs +++ b/app/desktop/windows-setup/setup/src/anim.rs @@ -7,11 +7,6 @@ pub fn ease_in_out_cubic(t: f32) -> f32 { } } -pub fn ease_out_cubic(t: f32) -> f32 { - let t = t.clamp(0.0, 1.0); - 1.0 - (1.0 - t).powi(3) -} - #[derive(Clone, Copy)] pub struct ScreenTransition { pub from: S, diff --git a/app/desktop/windows-setup/setup/src/ui.rs b/app/desktop/windows-setup/setup/src/ui.rs index 6658b0a..bb61dfb 100644 --- a/app/desktop/windows-setup/setup/src/ui.rs +++ b/app/desktop/windows-setup/setup/src/ui.rs @@ -399,7 +399,7 @@ impl eframe::App for SetupApp { .transition .is_some_and(|t| t.from == Screen::Welcome || t.to == Screen::Welcome); - ui.allocate_ui_at_rect(full, |ui| { + widgets::scope_at_rect(ui, full, |ui| { ui.set_clip_rect(full); if let Some(tr) = self.transition { let w = full.width(); @@ -412,10 +412,10 @@ impl eframe::App for SetupApp { }; let from = tr.from; let to = tr.to; - ui.allocate_ui_at_rect(full.translate(Vec2::new(out_x, 0.0)), |ui| { + widgets::scope_at_rect(ui, full.translate(Vec2::new(out_x, 0.0)), |ui| { self.draw_screen(ui, from, false); }); - ui.allocate_ui_at_rect(full.translate(Vec2::new(in_x, 0.0)), |ui| { + widgets::scope_at_rect(ui, full.translate(Vec2::new(in_x, 0.0)), |ui| { // Hover off during slide; clicks still register. self.draw_screen(ui, to, false); }); @@ -511,7 +511,7 @@ impl SetupApp { Rect::from_min_size(Pos2::new(left, y), Vec2::new(card_w, version_h)); if let Some(upgrade_rect) = upgrade_rect { - ui.allocate_ui_at_rect(upgrade_rect, |ui| { + widgets::scope_at_rect(ui, upgrade_rect, |ui| { ui.set_clip_rect(upgrade_rect); if widgets::choice_card_sized( ui, @@ -525,7 +525,7 @@ impl SetupApp { } }); } - ui.allocate_ui_at_rect(primary_rect, |ui| { + widgets::scope_at_rect(ui, primary_rect, |ui| { ui.set_clip_rect(primary_rect); if widgets::choice_card_sized( ui, @@ -542,7 +542,7 @@ impl SetupApp { } } }); - ui.allocate_ui_at_rect(portable_rect, |ui| { + widgets::scope_at_rect(ui, portable_rect, |ui| { ui.set_clip_rect(portable_rect); if widgets::choice_card_sized( ui, @@ -555,7 +555,7 @@ impl SetupApp { self.go(Screen::PortableOptions); } }); - ui.allocate_ui_at_rect(version_rect, |ui| { + widgets::scope_at_rect(ui, version_rect, |ui| { ui.with_layout(egui::Layout::top_down(egui::Align::Center), |ui| { ui.set_width(card_w); ui.label( @@ -578,7 +578,7 @@ impl SetupApp { Pos2::new(full.right(), bar_rect.top()), ); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -631,7 +631,7 @@ impl SetupApp { let mut back = false; let mut go_next = false; - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -671,7 +671,7 @@ impl SetupApp { Pos2::new(full.right(), bar_rect.top()), ); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -707,7 +707,7 @@ impl SetupApp { let mut back = false; let mut go_next = false; - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -747,7 +747,7 @@ impl SetupApp { Pos2::new(full.right(), bar_rect.top()), ); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -809,7 +809,7 @@ impl SetupApp { let mut back = false; let mut go_next = false; - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -872,7 +872,7 @@ impl SetupApp { ); let installed = self.installed.clone(); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -921,7 +921,7 @@ impl SetupApp { let mut back = false; let mut go_next = false; let can_upgrade = installed.is_some(); - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -1009,7 +1009,7 @@ impl SetupApp { Pos2::new(full.right(), bar_rect.top()), ); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -1083,7 +1083,7 @@ impl SetupApp { }); let ctx = ui.ctx().clone(); - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -1119,7 +1119,7 @@ impl SetupApp { Pos2::new(full.right(), bar_rect.top()), ); - ui.allocate_ui_at_rect(body_rect, |ui| { + widgets::scope_at_rect(ui, body_rect, |ui| { ui.set_clip_rect(body_rect); ui.add_space(TITLE_BAR_HEIGHT + 4.0); egui::Frame::none() @@ -1145,7 +1145,7 @@ impl SetupApp { }); let ctx = ui.ctx().clone(); - ui.allocate_ui_at_rect(bar_rect, |ui| { + widgets::scope_at_rect(ui, bar_rect, |ui| { ui.set_clip_rect(bar_rect); ui.with_layout(egui::Layout::left_to_right(egui::Align::Center), |ui| { egui::Frame::none() @@ -1742,35 +1742,12 @@ fn run_elevated_install( let _ = tx.send(ev); if done { got_terminal = true; - break; } } } Ok(()) } -fn find_app_exe(dest: &PathBuf) -> anyhow::Result { - find_jpackage_app_exe(dest).map_err(Into::into) -} - -fn walkdir_files(root: &PathBuf) -> anyhow::Result> { - let mut out = Vec::new(); - fn rec(dir: &PathBuf, out: &mut Vec) -> anyhow::Result<()> { - for e in std::fs::read_dir(dir)? { - let e = e?; - let p = e.path(); - if e.file_type()?.is_dir() { - rec(&p, out)?; - } else { - out.push(p); - } - } - Ok(()) - } - rec(root, &mut out)?; - Ok(out) -} - fn default_install_path(all_users: bool, edition: FromChatEdition) -> String { #[cfg(windows)] { diff --git a/app/desktop/windows-setup/setup/src/widgets.rs b/app/desktop/windows-setup/setup/src/widgets.rs index 9d352b4..f57e5e0 100644 --- a/app/desktop/windows-setup/setup/src/widgets.rs +++ b/app/desktop/windows-setup/setup/src/widgets.rs @@ -15,7 +15,12 @@ use crate::theme::{ TEXT_BUTTON_PAD_END_WITH_ICON, TEXT_BUTTON_PAD_START_WITH_ICON, TEXT_FIELD_CORNER_RADIUS, TEXT_FIELD_HEIGHT, TEXT_FIELD_PAD_HORIZONTAL, TEXT_FIELD_TRAILING_ICON_WIDTH, }; -use eframe::egui::{self, Color32, Id, Pos2, Rect, Rounding, Sense, Stroke, TextureHandle, Ui, Vec2}; +use eframe::egui::{self, Color32, Id, InnerResponse, Pos2, Rect, Rounding, Sense, Stroke, TextureHandle, Ui, UiBuilder, Vec2}; + +/// Lay out a child [Ui] in a fixed rectangle (replaces deprecated `allocate_ui_at_rect`). +pub fn scope_at_rect(ui: &mut Ui, rect: Rect, add_contents: impl FnOnce(&mut Ui) -> R) -> InnerResponse { + ui.scope_builder(UiBuilder::new().max_rect(rect), add_contents) +} pub const H_PADDING: f32 = 24.0; /// Matches [H_PADDING] so bottom / side insets stay equal. @@ -701,7 +706,7 @@ pub fn path_field(ui: &mut Ui, value: &mut String, enabled: bool, field_id: Id) paint_path_line(ui.painter(), &to_text, fade); } - ui.allocate_ui_at_rect(text_rect, |ui| { + scope_at_rect(ui, text_rect, |ui| { ui.set_clip_rect(text_rect); ui.with_layout( egui::Layout::left_to_right(egui::Align::Center), @@ -726,7 +731,7 @@ pub fn path_field(ui: &mut Ui, value: &mut String, enabled: bool, field_id: Id) }); let mut browse = false; - ui.allocate_ui_at_rect(icon_rect, |ui| { + scope_at_rect(ui, icon_rect, |ui| { ui.with_layout( egui::Layout::centered_and_justified(egui::Direction::LeftToRight), |ui| { diff --git a/app/desktop/windows-setup/setup/src/win_dialog.rs b/app/desktop/windows-setup/setup/src/win_dialog.rs index 85b1fcc..66c8222 100644 --- a/app/desktop/windows-setup/setup/src/win_dialog.rs +++ b/app/desktop/windows-setup/setup/src/win_dialog.rs @@ -5,7 +5,7 @@ mod imp { use windows::core::PCWSTR; use windows::Win32::Foundation::HWND; use windows::Win32::UI::WindowsAndMessaging::{ - MessageBoxW, MB_DEFBUTTON2, MB_ICONERROR, MB_ICONWARNING, MB_OK, MB_YESNO, IDNO, IDYES, + MessageBoxW, MB_DEFBUTTON2, MB_ICONERROR, MB_ICONWARNING, MB_OK, MB_YESNO, IDYES, }; fn wide(s: &str) -> Vec { diff --git a/gradle.properties b/gradle.properties index 2e4dd2e..e4833eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -34,4 +34,6 @@ android.enableR8.fullMode=true android.r8.optimizedResourceShrinking=true android.bundle.enableNativeLibraryCompressionInApk=true # Configuration cache can surface noisy IDE/sync issues on some setups; turn on when stable. -org.gradle.configuration-cache=false \ No newline at end of file +org.gradle.configuration-cache=false +# Windows CI hosts cannot run iOS simulator tests; suppress KMP disabled-target noise. +kotlin.native.ignoreDisabledTargets=true \ No newline at end of file