aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-28 20:47:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1234 from marcoarnulfo/feat/last-fill-outline-color

Browse Source
This commit is contained in:
Brandon Thomas
2026-10-23 17:10:41 -04:00
parent a7c4894471 58d746bc17
commit 4030f3c008
4 changed files with 186 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/last_color_tests.rs
+154
View File
@@ -0,0 +1,154 @@
//! Shape Fill and Shape Outline remember the last colour picked from their menu, and a click on
//! the button itself applies it again to the next selection, as in PowerPoint (#1080).
#![allow(clippy::unwrap_used, clippy::expect_used)]
use deckcraft_engine::Session;
use deckcraft_model::{ColorBase, ColorRef, Fill, SchemeSlot, ShapeId};
use egui::{Event, Key, Modifiers, PointerButton};
use egui_kittest::Harness;
use egui_kittest::kittest::Queryable;
use serde_json::json;
use crate::{Services, SlideApp};
/// Two rectangles, the first selected; the second starts red with a blue outline.
fn harness(tab: &str) -> (Harness<'static, SlideApp>, [ShapeId; 2]) {
let mut s = Session::with_new();
s.execute("slide.new", &json!({"layout": "blank"})).unwrap();
let mut ids = [ShapeId(0); 2];
for (i, x) in [100.0, 300.0].iter().enumerate() {
let r = s.execute("shape.insert", &json!({"preset": "rect", "rect": [x, 100.0, 80.0, 60.0]})).unwrap();
ids[i] = ShapeId(r["id"].as_u64().unwrap() as u32);
}
s.execute("selection.select", &json!({"ids": [ids[1].0]})).unwrap();
s.execute("shape.fill", &json!({"color": "#FF0000"})).unwrap();
s.execute("shape.line", &json!({"color": "#0000FF", "width": 3})).unwrap();
s.execute("selection.select", &json!({"ids": [ids[0].0]})).unwrap();
let mut app = SlideApp::new(s, Services::default());
app.ui.tab = tab.into();
let mut h = Harness::builder().with_size(egui::vec2(1800.0, 900.0)).build_ui_state(
|ui, app: &mut SlideApp| {
app.logic(ui.ctx());
app.ui(ui);
},
app,
);
h.run_steps(3);
(h, ids)
}
fn select(h: &mut Harness<'static, SlideApp>, id: ShapeId) {
h.state_mut().session.execute("selection.select", &json!({"ids": [id.0]})).unwrap();
h.run_steps(3);
}
/// Open the drop-down arrow of a split button, type a hex colour into "More Colors…" and press Enter.
fn pick_hex(h: &mut Harness<'static, SlideApp>, button: &str, hex: &str) {
let r = h.get_by_label(button).rect();
let arrow = egui::pos2(r.max.x - 5.0, r.center().y);
h.input_mut().events.push(Event::PointerMoved(arrow));
h.run_steps(2);
for pressed in [true, false] {
h.input_mut().events.push(Event::PointerButton { pos: arrow, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
h.run_steps(2);
}
h.run_steps(2);
// The hex field is the text input on the "More Colors… #" label's row, to its right.
let label = h.get_by_label("More Colors… #").rect();
let field = h
.get_all_by_role(egui::accesskit::Role::TextInput)
.filter(|n| n.rect().min.x >= label.max.x - 1.0 && (n.rect().center().y - label.center().y).abs() < 6.0)
.map(|n| n.rect().center())
.next()
.expect("the More Colors hex field");
for pressed in [true, false] {
h.input_mut().events.push(Event::PointerButton { pos: field, button: PointerButton::Primary, pressed, modifiers: Modifiers::NONE });
h.run_steps(2);
}
h.input_mut().events.push(Event::Text(hex.into()));
h.run_steps(2);
for pressed in [true, false] {
h.input_mut().events.push(Event::Key { key: Key::Enter, physical_key: None, pressed, repeat: false, modifiers: Modifiers::NONE });
h.run_steps(2);
}
h.run_steps(2);
}
fn fill_rgb(h: &Harness<'static, SlideApp>, id: ShapeId) -> Option<String> {
let sh = h.state().session.active().unwrap().shape(id).unwrap();
match sh.fill.as_ref()? {
Fill::Solid { color: ColorRef { base: ColorBase::Rgb { rgb }, .. } } => Some(rgb.hex()),
_ => None,
}
}
fn line_rgb(h: &Harness<'static, SlideApp>, id: ShapeId) -> Option<String> {
let sh = h.state().session.active().unwrap().shape(id).unwrap();
match sh.line.as_ref()?.fill.as_ref()? {
Fill::Solid { color: ColorRef { base: ColorBase::Rgb { rgb }, .. } } => Some(rgb.hex()),
_ => None,
}
}
fn line_width(h: &Harness<'static, SlideApp>, id: ShapeId) -> Option<f64> {
h.state().session.active().unwrap().shape(id).unwrap().line.as_ref()?.width
}
fn fill_reapplies(tab: &str) {
let (mut h, [a, b]) = harness(tab);
pick_hex(&mut h, "Shape Fill", "00AA55");
assert_eq!(fill_rgb(&h, a).as_deref(), Some("00AA55"), "the menu pick applies to the selection");
select(&mut h, b);
assert_eq!(fill_rgb(&h, b).as_deref(), Some("FF0000"), "selecting alone changes nothing");
h.get_by_label("Shape Fill").click();
h.run_steps(3);
assert_eq!(fill_rgb(&h, b).as_deref(), Some("00AA55"), "the button applies the last colour, not Accent 1");
}
fn outline_reapplies(tab: &str) {
let (mut h, [a, b]) = harness(tab);
pick_hex(&mut h, "Shape Outline", "AA5500");
assert_eq!(line_rgb(&h, a).as_deref(), Some("AA5500"), "the menu pick applies to the selection");
select(&mut h, b);
assert_eq!(line_rgb(&h, b).as_deref(), Some("0000FF"), "selecting alone changes nothing");
h.get_by_label("Shape Outline").click();
h.run_steps(3);
assert_eq!(line_rgb(&h, b).as_deref(), Some("AA5500"), "the button applies the last colour, not Text 1");
assert_eq!(line_width(&h, b), Some(3.0), "recolouring leaves the weight alone");
}
#[test]
fn home_shape_fill_button_reapplies_the_last_colour() {
fill_reapplies("Home");
}
#[test]
fn shape_format_shape_fill_button_reapplies_the_last_colour() {
fill_reapplies("Shape Format");
}
#[test]
fn home_shape_outline_button_reapplies_the_last_colour() {
outline_reapplies("Home");
}
#[test]
fn shape_format_shape_outline_button_reapplies_the_last_colour() {
outline_reapplies("Shape Format");
}
#[test]
fn before_any_pick_the_buttons_still_apply_accent_1_and_text_1() {
let (mut h, [a, _]) = harness("Home");
h.get_by_label("Shape Fill").click();
h.run_steps(3);
h.get_by_label("Shape Outline").click();
h.run_steps(3);
let sh = h.state().session.active().unwrap().shape(a).unwrap();
let slot = |f: &Option<Fill>| match f {
Some(Fill::Solid { color: ColorRef { base: ColorBase::Scheme { slot }, .. } }) => Some(*slot),
_ => None,
};
assert_eq!(slot(&sh.fill), Some(SchemeSlot::Accent1));
assert_eq!(slot(&sh.line.as_ref().unwrap().fill), Some(SchemeSlot::Tx1));
}
crates/ui-egui/src/lib.rs
+8
View File
@@ -435,6 +435,10 @@ struct AnimPreview {
}
pub struct SlideApp {
/// Shape Fill's last colour (a command colour parameter): the button applies it again. Accent 1 until one is picked.
pub last_fill: serde_json::Value,
/// Shape Outline's last colour, likewise. Text 1 until one is picked.
pub last_outline: serde_json::Value,
/// Table Design's border pen (`color`, `width`, `dash` for `table.borders`).
pub table_pen: serde_json::Value,
pub session: Session,
@@ -535,6 +539,8 @@ impl SlideApp {
pub fn new(session: Session, mut services: Services) -> Self {
let audio_out = services.audio_out.take();
SlideApp {
last_fill: serde_json::json!("accent1"),
last_outline: serde_json::json!("tx1"),
table_pen: serde_json::json!({"width": 1.0}),
session,
services,
@@ -2084,6 +2090,8 @@ mod huge_deck_tests;
#[cfg(test)]
mod ime_tests;
#[cfg(test)]
mod last_color_tests;
#[cfg(test)]
mod replacefonts_tests;
#[cfg(test)]
mod slide_size_tests;
crates/ui-egui/src/ribbon.rs
+23 -7
View File
@@ -925,13 +925,17 @@ fn drawing_group(app: &mut SlideApp, ui: &mut Ui) {
let sc = scheme(app);
let (m, a) = small_button_ex(ui, Icon::ShapeFill, "Shape Fill", sel, false, true);
if m.clicked() {
run(app, "shape.fill", json!({"color": "accent1"}));
let c = app.last_fill.clone();
run(app, "shape.fill", json!({"color": c}));
}
if let Some(a) = a {
widgets::color_popup(&a).show(|ui| {
if let Some(c) = widgets::color_grid(ui, &sc, Some("No Fill")) {
match c {
Some(c) => run(app, "shape.fill", json!({"color": cref_param(&c)})),
Some(c) => {
app.last_fill = cref_param(&c);
run(app, "shape.fill", json!({"color": cref_param(&c)}));
}
None => run(app, "shape.fill", json!({"none": true})),
}
}
@@ -939,7 +943,8 @@ fn drawing_group(app: &mut SlideApp, ui: &mut Ui) {
}
let (m, a) = small_button_ex(ui, Icon::ShapeOutline, "Shape Outline", sel, false, true);
if m.clicked() {
run(app, "shape.line", json!({"color": "tx1", "width": 1}));
let c = app.last_outline.clone();
run(app, "shape.line", json!({"color": c}));
}
if let Some(a) = a {
widgets::color_popup(&a).show(|ui| outline_menu(app, ui, &sc));
@@ -955,7 +960,10 @@ fn drawing_group(app: &mut SlideApp, ui: &mut Ui) {
pub fn outline_menu(app: &mut SlideApp, ui: &mut Ui, sc: &deckcraft_color::ColorScheme) {
if let Some(c) = widgets::color_grid(ui, sc, Some("No Outline")) {
match c {
Some(c) => run(app, "shape.line", json!({"color": cref_param(&c)})),
Some(c) => {
app.last_outline = cref_param(&c);
run(app, "shape.line", json!({"color": cref_param(&c)}));
}
None => run(app, "shape.line", json!({"none": true})),
}
}
@@ -2436,13 +2444,17 @@ fn shape_format(app: &mut SlideApp, ui: &mut Ui) {
rows(ui, |ui| {
let (m, a) = small_button_ex(ui, Icon::ShapeFill, "Shape Fill", sel, false, true);
if m.clicked() {
run(app, "shape.fill", json!({"color": "accent1"}));
let c = app.last_fill.clone();
run(app, "shape.fill", json!({"color": c}));
}
if let Some(a) = a {
widgets::color_popup(&a).show(|ui| {
if let Some(c) = widgets::color_grid(ui, &sc, Some("No Fill")) {
match c {
Some(c) => run(app, "shape.fill", json!({"color": cref_param(&c)})),
Some(c) => {
app.last_fill = cref_param(&c);
run(app, "shape.fill", json!({"color": cref_param(&c)}));
}
None => run(app, "shape.fill", json!({"none": true})),
}
}
@@ -2452,7 +2464,11 @@ fn shape_format(app: &mut SlideApp, ui: &mut Ui) {
}
});
}
let (_, a) = small_button_ex(ui, Icon::ShapeOutline, "Shape Outline", sel, false, true);
let (m, a) = small_button_ex(ui, Icon::ShapeOutline, "Shape Outline", sel, false, true);
if m.clicked() {
let c = app.last_outline.clone();
run(app, "shape.line", json!({"color": c}));
}
if let Some(a) = a {
widgets::color_popup(&a).show(|ui| outline_menu(app, ui, &sc));
}
docs/ui-parity.md
+1
View File
@@ -167,6 +167,7 @@ consistency is open (#73, #56).
| Date | Change | Summary |
|---|---|---|
| 2026-10-23 | trivial | Scroll bars on the zoomed slide pane (#1157) |
| 2026-10-23 | minor | Shape Fill and Shape Outline (Home and Shape Format): the button applies the last colour picked from its menu, Accent 1 and Text 1 until one is picked. Line weight and dashes are not changed by the button; Font Color and Highlight stay as they were (#1080) |
| 2026-10-16 | minor | Export › Change File Type › PNG and the Export… dialog offer a transparent background (#784) |
| 2026-10-14 | minor | Gray list markers on empty paragraphs while editing; caret keeps the list indent before typing |
| 2026-10-14 | minor | Community PR wave folded: one row each for Format Shape, Dialogs (41, listed from `dialogs.rs`), Animation Pane (timeline is in), window, Quick Access Toolbar, Format Background, rulers, image paste, context menus, exact size and edit points; estimates re-totalled (~26–46 h) |