mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-27 04:42:33 +00:00
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)
This commit is contained in:
@@ -11,6 +11,7 @@
|
||||
#include "BitmapComboBox.hpp"
|
||||
#include "Widgets/ComboBox.hpp"
|
||||
#include "GUI_Utils.hpp"
|
||||
#include "EncodedFilament.hpp"
|
||||
|
||||
class wxString;
|
||||
class wxTextCtrl;
|
||||
@@ -205,6 +206,10 @@ public:
|
||||
void OnSelect(wxCommandEvent& evt) override;
|
||||
void update_badge_according_flag();
|
||||
|
||||
FilamentColor get_cur_color_info();
|
||||
void show_default_color_picker();
|
||||
void sync_colour_config(const std::vector<std::string> &clrs, bool is_gradient);
|
||||
|
||||
private:
|
||||
// BBS
|
||||
wxColor m_color;
|
||||
|
||||
Reference in New Issue
Block a user