Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge PR #757

Brandon Thomas33816b916d07
diff --cc contributors/people.toml
index 23ff09171,827d12ad6..6dbb3c6a6
--- a/contributors/people.toml
+++ b/contributors/people.toml
@@@ -32,13 -28,8 +32,16 @@@ display_name = "insanityxoff
[people.moppeeer]
sync_github_name = true
+ [people.PiMinusMax]
+ display_name = "PiMinusMax"
+
[people.thaynej]
real_name = "Jeffrey Thayne"
+
+[people.webdevtodayjason]
+display_name = "Jason Brashear"
+
+[people.Nmarello]
+real_name = "Nick Marello"
+display_name = "Nick Marello"
+sync_github_name = false
diff --cc crates/ui-egui/src/lib.rs
index c56f5b300,56866a5d4..f15e2b4dd
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@@ -924,7 -772,10 +924,10 @@@ impl DesignApp
ctx.set_zoom_factor(scale);
}
if !self.styled {
+ // The UI scale is a preference (applied above); egui's own Cmd+Plus/Minus/0 would rescale the
+ // whole window instead of the canvas, only to be reset next frame.
+ ctx.options_mut(|o| o.zoom_with_keyboard = false);
- theme::install_fonts(ctx, &self.ui.language);
+ self.fonts_system = theme::install_fonts(ctx, &self.ui.language);
self.fonts_lang = self.ui.language.clone();
self.styled = true;
self.restyle = true;