Repository navigation
Show: Show Media Controls hides the playback bar - #679
Merged
h-a-n-a-s-h-i merged 1 commit intoOct 14, 2026
Merged
Conversation
The Slide Show checkbox wrote nothing. show.setup now stores showMediaControls, and the show draws the playback bar and GIF button only while that setting is on.
h-a-n-a-s-h-i
pushed a commit
that referenced
this pull request
Oct 14, 2026
…ntegrated 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
Member
|
Thank you for this contribution, @NikitkaRa! It has landed on If you haven't already, please come join us on Discord: https://discord.gg/artcraft |
anishguduru
pushed a commit
to anishguduru/deckcraft
that referenced
this pull request
Oct 16, 2026
…pace (winit#4478) (storytold#679) * macOS: IME text committed after the marked text is cleared isn't lost (winit#4650) winit 0.30.13 reports insertText as Ime::Commit only while marked text is left, and after any commit it swallows the next key. Real paths where that loses text: - input methods that end a composition with unmarkText, then insertText (rust-windowing/winit#3925): the committed text was dropped; - Apple Korean 2-Set, for the key typed after a syllable: on 한 then 5 it calls setMarkedText("한"), insertText("한"), setMarkedText(""), insertText("5"), so the 5 (or ;, or any key that ends the syllable) was dropped; - a commit made outside a key press (a candidate clicked with the mouse, dictation): no key follows to reset the state, so the next key (for example Backspace) was swallowed. vendor/winit now commits when a composition was started (pending_commit, set in setMarkedText, cleared by the commit and when IME is disallowed); other insertText calls still reach the app as KeyboardInput. A commit outside keyDown clears the marked text and returns to the ground state. validAttributesForMarkedText lists the underline and marked-clause attributes, which some input methods need before they compose. This is rust-windowing/winit#4650, the 0.30 backport of #4651 (merged on winit master), plus the part of #4748 that fixes #4651's out-of-key-press case (#4748's other parts are not included). One correction: upstream spells the underline attribute "NSUnderlineStyle", but AppKit's NSUnderlineStyleAttributeName is "NSUnderline" (printed on macOS 14), so the AppKit value is used. Checked with the real input methods on macOS 14.7.1 (a scratch winit app fed key events through AppKit): with the patch 한+5 and 한+; commit the 5 and ;, unmarkText-then-insertText commits, and Backspace after a commit outside a key press is delivered; ABC typing, held keys, Japanese (日本, あ), Cangjie (日) and Korean composition give the same events as before. A test fails if a re-vendored winit loses the patch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * macOS: Space in Apple Korean with no syllable in progress types one space (winit#4478) With Apple Korean 2-Set on macOS 14, Space with no syllable in progress (a second space, or a space after a digit or punctuation) makes AppKit call setMarkedText(" "), insertText(" "), then setMarkedText(""). winit reports the insertText as Ime::Commit(" "), but the trailing empty setMarkedText returns its state to the ground state, so keyDown also sends the key as KeyboardInput with text " ". egui inserts both, and PdfCraft's text fields got two spaces (the double space of alacritty/alacritty#8079). vendor/winit now records that the key being handled committed IME text and then doesn't also send it as KeyboardInput, unless AppKit forwards it as a command through doCommandBySelector (Enter after a syllable still commits the syllable and sends Enter). keyDown consumes the record on every key, so keys typed after IME is disallowed are unaffected. rust-windowing/winit#4478 aims at the same double space, but its changes (clearing the marked text on commit, forwarding a later insertText, and dropping doCommandBySelector's guard) don't reach this call order, and the key loss it also fixes is already fixed by the previous change (pending_commit). This is the narrow form for the call order observed here; it should go upstream with #4478. Checked with the real input methods on macOS 14.7.1 (scratch winit app, on top of the previous change): the duplicate KeyboardInput Space is gone and nothing else changes (Korean syllables, 한+Enter, 한+5, Japanese, Cangjie, ABC, held keys, keys after IME is disallowed). A test fails if a re-vendored winit loses the patch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Keep storytold#678's emoji-picker branch: view.rs is main's plus this PR's Space fix (54b3d3c) --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Brandon Thomas <echelon@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Slide Show ▸ Show Media Controls painted the current value and ignored the click.
show.setupnow takesshowMediaControls, and a show draws the playback bar (and the GIF corner button) only while it is on. Default stays on; clicking a clip still plays it.Test plan
cargo fmt --all -- --checkcargo clippy --workspace --all-targets -- -D warningscargo test --workspace(except 3 known macOS env font/IME failures)cargo xtask assets,layers,wasm