aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-24 18:46:57 -06:00
Code Issues Packages Projects Releases Wiki Activity
652 Commits 75 Branches 9 Tags
822c8f44b3f8daf0743cf0e7bcc37f4e4eacb911
Commit Graph
652 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Thomas 822c8f44b3 Merge PR #369 from NikitkaRa: Mark the current transition effect option (#365) 
# Conflicts:
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:44:56 -04:00
Brandon ThomasandClaude Opus 5.5 526e31d1f7 Fix up merged PRs: a picked file remembers main's Handout and Notes Master views (#479) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:44:40 -04:00
Brandon Thomas 5fbdb6c79e Merge PR #479 from NikitkaRa: Web: keep a picked file on the document and slide that asked for it 
# Conflicts:
#	crates/ui-egui/src/lib.rs
 2026-10-14 14:43:55 -04:00
Brandon Thomas 4416bc170a Merge PR #697 from NikitkaRa: UI: Format Shape fill transparency follows the selection 
# Conflicts:
#	crates/ui-egui/src/panes.rs
 2026-10-14 14:43:08 -04:00
Brandon Thomas bd607f333a Merge PR #648 from NikitkaRa: Canvas: a trackpad swipe turns the page 
# Conflicts:
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/lib.rs
 2026-10-14 14:42:43 -04:00
Brandon Thomas 6f38c958b6 Merge PR #674 from NikitkaRa: Canvas: a two-finger twist rotates the selection 
# Conflicts:
#	crates/engine/src/cmd/shape.rs
#	crates/ui-egui/src/lib.rs
 2026-10-14 14:42:12 -04:00
Brandon Thomas 5ed2f808e3 Merge PR #539 from NikitkaRa: Draw: Ink to Shape converts pen strokes into shapes 
# Conflicts:
#	crates/engine/src/cmd/shape.rs
#	crates/engine/src/lib.rs
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:41:19 -04:00
Brandon Thomas 79b3e3693f Merge PR #571 from NikitkaRa: UI: preview slide animations on the editor canvas 
# Conflicts:
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/control.rs
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/show.rs
 2026-10-14 14:40:51 -04:00
Brandon ThomasandClaude Opus 5.5 7dcfe0f989 Fix up merged PRs: a textless shape still copies as the objects marker so Ctrl+V pastes it (#182), not as a picture (#702) 
With only an image on the system clipboard egui-winit drops Ctrl+V, so #702's
picture copy of a textless shape undid main's #182 fix. Text keeps #702's HTML,
and empty plain text falls back to the marker.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:40:18 -04:00
Brandon Thomas 38e95d8c15 Merge PR #702 from NikitkaRa: Clipboard: rich text and pictures for Pages and Keynote 
# Conflicts:
#	crates/engine/src/cmd/edit.rs
#	crates/ui-egui/src/lib.rs
 2026-10-14 14:39:36 -04:00
Brandon Thomas c3489d6a99 Merge PR #655 from NikitkaRa: Show: presenter view keeps a portrait Next slide inside its column 
# Conflicts:
#	crates/ui-egui/src/show.rs
 2026-10-14 14:37:36 -04:00
Brandon ThomasandClaude Opus 5.5 2a410e54fa Fix up merged PRs: main's newer textures (document window, SmartArt previews, show grid) go through textures::upload so they stay within the GPU max texture side (#652) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:37:30 -04:00
Brandon Thomas e225e4eec1 Merge PR #652 from NikitkaRa: UI: keep every texture within the GPU max texture side 
# Conflicts:
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/panes.rs
 2026-10-14 14:37:12 -04:00
Brandon Thomas a0d97fa931 Merge PR #644 from NikitkaRa: Startup: survive damaged settings, font folders, recovery folders and small texture limits 
# Conflicts:
#	crates/engine/src/recovery.rs
#	crates/fonts/src/fontdb.rs
#	crates/fonts/src/lib.rs
#	crates/ui-egui/src/lib.rs
 2026-10-14 14:24:45 -04:00
Brandon Thomas 0c2c433ade Merge the chart and EMF+ metafile PRs integrated on land-r2 (#532 #537 #591 #594 #598 #602 #603 #638 #640 #662 #666 #669 #690 #582 #588 #633 #635) 
# Conflicts:
#	crates/pptx/src/write/mod.rs
#	crates/pptx/tests/roundtrip.rs
 2026-10-14 14:17:35 -04:00
Brandon ThomasandClaude Opus 5.5 a85024558d Fix up merged PRs: Quick Access Toolbar defaults keep main's Export button and custom-show start 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:16:59 -04:00
Brandon Thomas f6661ed15e Merge PR #563 from NikitkaRa: UI: customizable Quick Access Toolbar 
# Conflicts:
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:16:22 -04:00
Brandon ThomasandClaude Opus 5.5 b2b378a3f0 Fix up merged PRs: dedupe doc rows left by the union merges 
One EMF / WMF parity row naming both GDI clip regions and EMF+ playback; drop
the stale Tables, Charts, chartex and SmartArt rows that came back with the
chartex PRs; one SVG-gap sentence; one charts-gap paragraph.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:13:50 -04:00
Brandon Thomas ea12297822 Merge PR #223 from marcoarnulfo: Title bar: on macOS the window buttons sit centred in it (#71) 
# Conflicts:
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:13:29 -04:00
Brandon Thomas 4eae520beb Merge PR #484 from NikitkaRa: Video: check the whole picture store against a memory budget (#398) 
# Conflicts:
#	crates/av1/src/decoder.rs
 2026-10-14 14:12:46 -04:00
Brandon Thomas 16355053e1 Merge PR #481 from NikitkaRa: AV1: reject duplicate film-grain scaling points; a failed job still publishes (#394) 
# Conflicts:
#	crates/av1/src/decoder.rs
 2026-10-14 14:12:22 -04:00
Brandon Thomas 8ea2cb0871 Merge PR #361 from NikitkaRa: CLI: say that render --slide counts from 0 (#359) 
# Conflicts:
#	apps/deckcraft-cli/src/main.rs
 2026-10-14 14:12:10 -04:00
Brandon Thomas 3a8927e3f3 Merge PR #691 from NikitkaRa: UI: Trim Media dialog follows the selection 
# Conflicts:
#	crates/ui-egui/src/dialogs.rs
 2026-10-14 14:11:53 -04:00
Brandon ThomasandClaude Opus 5.5 0c3f4eee63 Fix up merged PRs: Slide Master Preserve/placeholders know the notes and handout master views 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:07:31 -04:00
Brandon Thomas a4fa978903 Merge PR #703 from NikitkaRa: UI: Slide Master Preserve and Title or Footers placeholders 
# Conflicts:
#	crates/engine/src/cmd/design.rs
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:06:42 -04:00
Brandon ThomasandClaude Opus 5.5 31e22977f7 Fix up merged PRs: the palette test skips UI commands that need a value (#440 hides them) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 14:05:00 -04:00
Brandon Thomas 7266b30018 Merge PR #698 from NikitkaRa: UI: Design Effects applies a theme effect scheme 
# Conflicts:
#	crates/engine/src/cmd/design.rs
#	crates/ui-egui/src/ribbon.rs
 2026-10-14 14:04:24 -04:00
Brandon Thomas 2009242055 Merge PR #684 from NikitkaRa: Export: a PNG or JPEG slide records 144 dpi at the default 2× size 
# Conflicts:
#	crates/engine/src/cmd/file.rs
#	crates/engine/src/tests.rs
 2026-10-14 14:02:59 -04:00
Brandon Thomas 1e80cd5547 Merge PR #440 from NikitkaRa: Palette: skip commands that need a value 
# Conflicts:
#	crates/ui-egui/src/menus.rs
 2026-10-14 14:01:08 -04:00
Brandon Thomas 749656605c Merge PR #635 from NikitkaRa: Metafile: EMF+ Clear, and the EMF+ record coverage written down 2026-10-14 13:57:48 -04:00
Brandon Thomas 1360b283f3 Merge PR #633 from NikitkaRa: Metafile: EMF+ cardinal curves and region fills 
# Conflicts:
#	crates/render/src/tests.rs
 2026-10-14 13:57:48 -04:00
Brandon ThomasandClaude Opus 5.5 389c4dd5d0 Fix up merged PRs: #588's polygon clip and nested metafiles with clip regions 
Move #588's clip.rs changes into cliprect.rs, carry main's per-item clip
region through the polygon clipper, and build nested-metafile items with the
region field main added (the nested picture's own regions are not carried
over; each item takes the canvas's current clip).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:56:56 -04:00
Brandon Thomas b3c9cc099c Merge the PPTX writer, notes/handout master, PDF and slide-show PRs integrated on land-r3 (#518 #531 #535 #533 #572 #573 #577 #580 #583 #592 #685 #528 #483 #490 #441 #671 #679 #649 #656 #660 #664 #224) 
# Conflicts:
#	crates/engine/src/tests.rs
#	crates/model/src/lib.rs
#	crates/pptx/src/write/mod.rs
#	crates/render/src/lib.rs
#	crates/ui-egui/src/canvas.rs
#	crates/ui-egui/src/lib.rs
#	crates/ui-egui/src/thumbs.rs
 2026-10-14 13:56:41 -04:00
Brandon Thomas 4d7406be10 Merge PR #588 from NikitkaRa: Metafile: EMF+ arcs, convex clip paths, wrapped strings, nested metafiles 
# Conflicts:
#	crates/metafile/src/canvas.rs
#	crates/metafile/src/clip.rs
#	crates/metafile/src/emfplus.rs
 2026-10-14 13:56:02 -04:00
Brandon Thomas 126029db40 Merge PR #254 from xmaks82: Text: honour spcFirstLastPara (space before the first paragraph) 
# Conflicts:
#	crates/pptx/src/read/dml.rs
#	crates/text/src/lib.rs
#	crates/text/src/tests.rs
 2026-10-14 13:55:43 -04:00
Brandon ThomasandClaude Opus 5.5 3450180f19 Fix up merged PRs: EMF+ clipping alongside GDI clip regions 
main added its own clip.rs (GDI rectangle regions carried on every drawn
item); #582 added a clip.rs that cuts drawing geometrically to the EMF+ clip
rectangle. Keep main's module, move #582's to cliprect.rs, keep the EMF+
rectangle on the canvas as plus_clip, and carry the region field through the
geometric clipper.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:55:38 -04:00
Brandon Thomas eab5686393 Merge PR #582 from NikitkaRa: Metafile: EMF+ images, text, gradient brushes and clipping 
# Conflicts:
#	crates/metafile/src/canvas.rs
#	crates/metafile/src/clip.rs
 2026-10-14 13:54:59 -04:00
Brandon Thomas 912598fa46 Merge PR #675 from NikitkaRa: View: Zoom dialog applies a percent or Fit 
# Conflicts:
#	crates/ui-egui/src/dialogs.rs
 2026-10-14 13:54:33 -04:00
Brandon Thomas ad7eb45abe Merge PR #690 from NikitkaRa: Charts: a chart frame with no width no longer panics 
# Conflicts:
#	crates/render/src/chart.rs
#	crates/render/src/tests.rs
 2026-10-14 13:53:49 -04:00
Brandon ThomasandClaude Opus 5.5 5c7e9fc6c3 Format the merged PRs (cargo fmt) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:53:13 -04:00
Brandon ThomasandClaude Opus 5.5 bb3627f954 Fix up merged PRs: minor gridlines on a logarithmic axis 
#666's minor gridlines stepped in value units, but #669 scales a log axis in
exponents of its base; map each minor step back through the base.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:53:06 -04:00
Brandon ThomasandClaude Opus 5.5 f9c1000e35 Fix up merged PRs: rustfmt; drop doc rows the union merge left twice 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:51:53 -04:00
Brandon ThomasandClaude Opus 5.5 0ac222a543 Fix up merged PRs: split ribbon buttons carry their label once (#512's label predates main's) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:51:49 -04:00
Brandon Thomas 6d1b01b73d Merge PR #669 from NikitkaRa: Charts: logarithmic value axes 
# Conflicts:
#	crates/pptx/src/read/chart.rs
#	crates/render/src/chart.rs
 2026-10-14 13:51:30 -04:00
Brandon Thomas 808087e6a5 Merge PR #666 from NikitkaRa: Charts: value-axis minor gridlines 
# Conflicts:
#	crates/pptx/src/read/chart.rs
 2026-10-14 13:50:53 -04:00
Brandon ThomasandClaude Opus 5.5 5089d615bf Fix up merged PRs: scatter trendlines follow the value x axis 
#662 gives scatter and bubble charts one x scale over every series; #603's
trendlines still mapped x over each series' own extent, so a fit drifted off
its points. Use the chart's x scale where there is one.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:50:37 -04:00
Brandon ThomasandClaude Opus 5.5 6902c4bf92 Fix up merged PRs: every presenter-view button uses the light-on-dark style (#221) 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
 2026-10-14 13:50:27 -04:00
Brandon Thomas d2bf428362 Merge PR #224 from justinjohn0306: Notes and Presenter View: long notes scroll, presenter controls show (#221) 
# Conflicts:
#	crates/ui-egui/src/show.rs
 2026-10-14 13:50:20 -04:00
Brandon Thomas 256ad7057c Merge PR #662 from NikitkaRa: Charts: scatter and bubble charts get a value x axis 
# Conflicts:
#	crates/render/src/chart.rs
 2026-10-14 13:49:59 -04:00
Brandon Thomas bc62c58b17 Merge PR #664 from NikitkaRa: Show: show the slide number while typing it 
# Conflicts:
#	crates/ui-egui/src/show.rs
 2026-10-14 13:49:49 -04:00