aleleba/designcraft
1
0
Fork 0
mirror of https://github.com/storytold/designcraft.git synced 2026-10-24 10:16:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1383 from Silvertree2010/fix/1340-bug-the-preview-box-in-the-parag

Browse Source 
Remember the Preview checkbox in Paragraph/Character Style Options
This commit is contained in:
Brandon Thomas
2026-10-23 17:28:32 -04:00
committed by GitHub
parent b892eccaa8 c35dd44f82
commit bd418b3913
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/dialogs.rs
+29 -1
View File
@@ -2839,6 +2839,7 @@ pub fn show(app: &mut DesignApp, ctx: &egui::Context) {
ui.horizontal(|ui| {
if matches!(d.id.as_str(), "paragraphStyleOptions" | "characterStyleOptions") && !d.b("new") {
check(ui, &mut d, "preview", crate::i18n::tr(&app.ui.language, "Preview"));
app.ui.style_preview = d.b("preview");
style_options_preview(app, &mut d);
}
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
@@ -5157,7 +5158,7 @@ pub fn open_style_options(app: &mut DesignApp, para: bool, name: &str) {
return;
}
let id = if para { "paragraphStyleOptions" } else { "characterStyleOptions" };
app.ui.dialog = Some(Dialog::new(id, json!({"name": name})));
app.ui.dialog = Some(Dialog::new(id, json!({"name": name, "preview": app.ui.style_preview})));
}
/// New Paragraph Style… / New Character Style…: the style options for a style made on OK, named
@@ -7773,6 +7774,33 @@ mod tests {
assert!(dialog.fields["status"].as_str().unwrap().contains("page size out of range"));
}
#[test]
fn style_options_preview_choice_is_remembered_on_reopen() {
use egui_kittest::{Harness, kittest::Queryable};
let mut app = DesignApp::new(designcraft_engine::Session::new(), crate::Services::default());
app.run("file.new", json!({})).unwrap();
app.run("style.paragraph.create", json!({"name":"Tutorial","chars":{"size":10}})).unwrap();
open_style_options(&mut app, true, "Tutorial");
let mut h = Harness::builder().with_size(egui::vec2(1000.0, 800.0)).build_ui_state(
|ui, app: &mut DesignApp| {
let key = egui::Id::new("style_preview_remember_fonts");
if ui.data(|d| d.get_temp::<bool>(key)).is_none() {
crate::theme::install_fonts(ui.ctx(), "");
ui.data_mut(|d| d.insert_temp(key, true));
return;
}
show(app, ui.ctx());
},
app,
);
h.run_steps(3);
h.get_by_label("Preview").click();
h.run_steps(3);
cancel(h.state_mut());
open_style_options(h.state_mut(), true, "Tutorial");
assert!(h.state().ui.dialog.as_ref().unwrap().b("preview"), "Preview stays checked on reopen");
}
#[test]
fn style_options_preview_updates_all_uses_cancels_and_commits_once() {
use egui_kittest::{Harness, kittest::Queryable};
crates/ui-egui/src/lib.rs
+3
View File
@@ -240,6 +240,8 @@ pub struct UiState {
pub flattener: String,
/// File › Export PDF… options (persisted; see `PdfExportSettings`).
pub pdf_export: PdfExportSettings,
/// The Preview checkbox of Paragraph/Character Style Options, remembered between openings.
pub style_preview: bool,
/// View › Separations Preview: a process plate (0–3) and/or an ink limit (total, 0–4).
#[serde(skip)]
pub separation: Option<u8>,
@@ -398,6 +400,7 @@ impl Default for UiState {
language: String::new(),
flattener: String::new(),
pdf_export: PdfExportSettings::default(),
style_preview: false,
separation: None,
ink_limit: None,
display_quality: designcraft_render::DisplayQuality::High,