fix: replace Cancel button style with explicit border width#529
Merged
Conversation
This PR implements the official filament color management system for Snapmaker U1 printers, enabling users to select filament colors from an official color library with multi-color (dual-segment/gradient) visual support. Add Snapmaker official filament color management with multi-color metadata, official color selection dialog, and persisted self-described color data. Add filament color data structures, mode normalization, and hex/multi-color helpers Load official filament color catalog and match by material name with filament ID fallback Support official color selection, localized color names, SKU display, and custom color fallback Render single, segmented, and gradient filament colors in preset lists and paint toolbars Sync multi-color fields through preset/project configuration and preprint data Avoid writing Snapmaker-only SKU data into 3MF project settings Preserve existing mixed-filament badge behavior while adding official color bitmap rendering
# Conflicts: # localization/i18n/zh_CN/Snapmaker_Orca_zh_CN.po
Rename private member variables to better indicate their types: - _filaments -> _filamentInfoVec - _filamentIndexById -> _filamentIndexByIdMap - _filamentIndexByName -> _filamentIndexByNameMap
- Remove SetStyle(ButtonStyle::Regular, ButtonType::Choice) to avoid overriding the custom border/background color settings - Add SetBorderWidth(FromDIP(1)) so the Cancel button retains a visible outline matching the D1D5DC border color
…ent_color_adaptation # Conflicts: # src/slic3r/GUI/FilamentColorDialog.cpp # src/slic3r/GUI/MixedFilamentBadge.cpp # src/slic3r/GUI/MixedFilamentBadge.hpp
- Remove SetStyle(ButtonStyle::Regular, ButtonType::Choice) to avoid overriding the custom border/background color settings - Add SetBorderWidth(FromDIP(1)) so the Cancel button retains a visible outline matching the D1D5DC border color
LiuLikeQian
approved these changes
Jun 22, 2026
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
2 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.
Description
overriding the custom border/background color settings
visible outline matching the D1D5DC border color