Commit Graph
19 Commits
Author SHA1 Message Date
Tartare 95c63e2534 FIX: Persist custom colors in default filament color picker
Saved colors now reappear when reopening the picker.

jira: STUDIO-14100

Change-Id: I0348a177fcacb83779cf8c9c21151df5ccfd3e8d
(cherry picked from commit 7c21048b510ea993520e74d7068d17f0a879315f)
2025-10-03 23:09:48 +08:00
fei2.fang f60a6f8490 FIX: Restore material number and color display in “Filament for Supports” menu
jira: STUDIO-13670

Change-Id: I1779aedc84d5ef5d9e59dd75a164d02b4274a78a
(cherry picked from commit 8f361ab2a68a2eeabc4b1994b93f749cfbd668d3)
2025-10-02 09:53:43 +08:00
fei2.fang f2e759e885 FIX: Correct auto-calc of flush value and default color picker selection
jira: STUDIO-13718, STUDIO-13666

Change-Id: I5dd08d3ed46423ba6b3c6cb4c022cfc36f46c620
(cherry picked from commit 173a6ee070d6b5e1ac445f0ebdc4c2fdd145e253)
2025-10-01 21:58:02 +08:00
fei2.fang 51151a89c5 FIX: Prevent crash when rendering color button on linux
jira: none

Change-Id: I8758c3a352bd206ff81ce72ed0ad902f8a79c30e
(cherry picked from commit 45818c4e762b540feb0a67d117b595eb589e8058)
2025-10-01 16:09:17 +08:00
fei2.fang f7758b1831 FIX: Allow white color selection in default color picker
jira: STUDIO-13666

Change-Id: Ia2f5d8a1830a14d519c9277a88148a723f3d1be0
(cherry picked from commit fccfee6208c5ddc0552004d0642771f99f10dd67)
2025-09-30 15:32:44 +08:00
fei2.fang 91d4b14ba7 FIX: Mac semi-translucent colors & suppress dialog flicker during system picker
• Official filament picker now renders semi-transparent colors correctly on macOS.
• Disables the flicker prompt while the default system color picker is open.

jira: STUDIO-13452

Change-Id: I6a83d3cf488114f92813e378b507f293d7c4254e
(cherry picked from commit 4cd2c47f99f956681f41a1af0343efc9ad377684)
2025-09-30 15:32:44 +08:00
fei2.fang 723ce9d431 ENH: Flash filament dialog on outside click to prompt focus
Brief flicker reminds users to act on the dialog before proceeding elsewhere.

jira: STUDIO-13492

Change-Id: I3daaa567f4aa738094fc01effcd9b9245aea9d2c
(cherry picked from commit 3decd7a5e4f5a13b7fd1dbb0fc39e0b3849ed6d1)
2025-09-30 15:32:44 +08:00
fei2.fang 6c242c5101 FIX: Honor transparency and add contrasting borders for both themes
jira: STUDIO-13394

Change-Id: I47f3108318ba72895cf5a906a2566d46f3ed3ff9
(cherry picked from commit bac1c5ecceb3dfdf11844beca9d9ec71c6453340)
2025-09-30 14:31:54 +08:00
fei2.fang a7da1da78a FIX: Include missing file path in translation list
jira: none

Change-Id: I5ec5f33d41caa52c285a79072e74839faa18002a
(cherry picked from commit 3cadf39cfe462e7c14ba45ed68ab6a450c9abb4e)
2025-09-29 20:39:29 +08:00
fei2.fang ad7725a020 FIX: Add overflow protection and clean up filament picker internals
- Add safeguards for invalid idx when opening color picker
- Prevent crash when filament color data is missing or uninitialized
- Simplify private member variable naming in filament picker dialog

jira: STUDIO-12956

Change-Id: I455565bdac769f497f22f884e19cd0cbb04fb8c3
(cherry picked from commit 705ad911ee81395b2162ae67a8f64e237f6a3c5d)
2025-09-28 17:31:07 +08:00
fei2.fang 6247ec1e83 FIX: Revert unintended font size change in official picker dialog
jira: STUDIO-13152

Change-Id: Ic3f26359a089a4cd1369fd2f06f450c4ae540634
(cherry picked from commit fdfd5fd479573f6f7871600f5a9b442cb13c8c68)
2025-09-28 17:30:57 +08:00
fei2.fang b6a68ef312 FIX: Improve name display and official filament handling
- Use ellipsis to truncate long preset names and type names in the official picker
- Show user-defined name for official filaments by default in the picker

jira: STUDIO-12936, STUDIO-13128, STUDIO-13129

Change-Id: I744b44df32a7108a4273c3746eedddd9cde436e9
(cherry picked from commit dc0a66fd2017d4361d6b5597c36142bb03a92374)
2025-09-28 17:10:30 +08:00
fei2.fang ea826815af FIX: Show RGB for custom color and allow staying in official picker dialog
- Display RGB values when a custom color is selected
- Prevent official color picker dialog from closing when custom color dialog is canceled
- Ensure multi-color materials are correctly displayed when importing new 3MF files

jira: STUDIO-12938, STUDIO-12937, STUDIO-12933, STUDIO-13110

Change-Id: Iab410585bf8cc5e9e81c6f0da23fe4ddba561785
(cherry picked from commit 2c20d591b998b02b0b66ac81b048a28fa26bd409)
2025-09-28 15:01:11 +08:00
fei2.fang e3cb884ee8 FIX: Correct the label alignment problem on MacOS
- Adjust the color of the dividing line to be darker in dark mode.

jira: STUDIO-12982, STUDIO-12935

Change-Id: Icda8dd10dbcc470e55c8760716f5545fb784f194
(cherry picked from commit 60aa221033134dfba19830f71cd307db91119ed6)
2025-09-28 14:59:03 +08:00
fei2.fang 27943f7047 FIX: Correct virtual tray loading and multi-color material display
- Fixed incorrect is_array() check on vtray["cols"], causing virtual tray init failure.
- Rewrote AMS grouping logic using iterators and set<int> for cleaner and safer traversal.

jira: STUDIO-12955

Change-Id: I09a68e259b56864260abb6c59ff9b1bf7ec2823c
(cherry picked from commit 60c47473047a3fba20d59cd974179537c116524d)
2025-09-28 14:19:10 +08:00
fei2.fang 470ed6af5d FIX: Support dark mode in filament picker
- Applied dark theme styling to filament picker dialog
- Fixed color picker background not updating on theme switch

jira: STUDIO-12935

Change-Id: I9c7dcc518e7b0bd2c330f477ee42f4c61ea9fd4b
(cherry picked from commit 66ae7a02b945ff603b2dc699c93e55589481379e)
2025-09-28 14:19:02 +08:00
fei2.fang 9ee76e4775 NEW: Official filament color selection approved
- Add a filament picker dialog for official color selection
- Enable displaying multiple filament colors in the picker dialog and preview sidebar
- Introduce two new config options:
  - `filament_multi_colors`
  - `filament_color_types`
  to both the application config and the 3MF config

jira: STUDIO-12346

Change-Id: I66f8c1ec9147df4f5948c8a329c1737551280e63
(cherry picked from commit 522dc0bbca49033a1ba9725ca7f6c3ea729691a6)
2025-09-28 14:17:52 +08:00
fei2.fang 008a98ccda FIX: Align printer preset controls in sidebar
jira: STUDIO-12397
Change-Id: I728d84b8862de0a72ef467388cbf4c63b24fdcc8
(cherry picked from commit 7ceff77207916b059aa1add0f9869d0e55a59023)
2025-09-25 20:48:14 +08:00
fei2.fang 2d69d58ce9 FIX: Corrected firmware update title for printer
jira: STUDIO-12322

Change-Id: I3040026acbb3fc5525cbda8eefae1b013b065a25
(cherry picked from commit 3e2e115e0e6727b33dcf0d47c597cdb18ab7ef50)
2025-09-24 11:03:29 +08:00