Sync main into build_platform_engineering - #872
Merged
Merged
Conversation
Replace the web logo assets under resources/web/image with the new Orca icon design (same artwork as the flutter_web 2.3.38 official-site logo master): - logo.png: 154x154, new full-bleed icon with the original rounded-corner silhouette preserved (wizard/homepage render the PNG directly, corners are baked in) - logo2.png: 339x406, square icon kept at original proportions and centered with equal black padding, no stretching The web bundle copies were missed by the app icon update in #858, which only touched resources/images/* and the app icon files.
Opening a model from Snapmaker Space downloads and loads it correctly, and then post_init() throws it away. The model appears on the plate for a moment, the plate clears and the title becomes "Untitled". macOS does not pass the URL in argv. LaunchServices starts the app first and delivers the URL afterwards through MacOpenURL, so init_params->input_files is empty and switch_to_3d is never set. post_init() therefore takes its ordinary startup path, sends the user to the home page and calls trigger_restore_project, which starts a blank project over the model MacOpenURL is loading. Windows is unaffected because the URL does arrive in argv, switch_to_3d is true, and that whole block is skipped. Set a flag in MacOpenURL and check it where switch_to_3d cannot reach, which gives the URL path on macOS the same treatment it already gets elsewhere. Fixes #851
#865) * fix(mac): stabilize local device WebView loads and printer page switching Declare localhost ATS/local-network entitlements, serialize WKWebView navigations to avoid cancelled -999 white screens, and reload the Device tab URL when switching between U1 and non-U1 printers. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(mac): skip destroyed WKWebView script handler installs Guard CallAfter and delayed AddScriptMessageHandler against views already removed from g_webviews, matching BambuStudio OrcaSlicer#11004 / OrcaSlicer#10968. Co-authored-by: Cursor <cursoragent@cursor.com> * fix: restore calibration ConfigOptionBools/Floats types in Plater A later WebView change accidentally reverted #861's arrayed option types. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(mac): let Device WebView navigation gate receive LOADED/ERROR Bind PrinterWebView handlers on the panel and Skip so WKWebView settle can clear the in-flight URL. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Alves <alves@Alvesmac-3.local> Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: alves <‘liulikeqian@gmail.com’>
4 tasks
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
4 participants
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
Sync
build_platform_engineering(ae19088) with the latestmain(5847490).maincommits that the base branch is missing:main, so this merges cleanly (fast-forward-able).Why
Unblocks #870 (MQTT disconnect crash fix) — once this lands, #870 will show only its own 2 fix commits instead of mixing in
main's delta.