juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Persist custom colors in default filament color picker

Browse Source 
Saved colors now reappear when reopening the picker.

jira: STUDIO-14100

Change-Id: I0348a177fcacb83779cf8c9c21151df5ccfd3e8d
(cherry picked from commit 7c21048b510ea993520e74d7068d17f0a879315f)
This commit is contained in:
Tartare
2025-08-20 11:12:54 +08:00
committed by Noisyfox
parent 17d463c841
commit 95c63e2534
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/slic3r/GUI/wxExtensions.cpp
View File

@@ -4,7 +4,6 @@
#include <cmath> #include <cmath>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include "GUI.hpp" #include "GUI.hpp"
@@ -19,6 +18,7 @@
#include "Widgets/Label.hpp" #include "Widgets/Label.hpp"
#include "../Utils/WxFontUtils.hpp" #include "../Utils/WxFontUtils.hpp"
#include "FilamentBitmapUtils.hpp" #include "FilamentBitmapUtils.hpp"
#include "../Utils/ColorSpaceConvert.hpp"
#ifndef __linux__ #ifndef __linux__
// msw_menuitem_bitmaps is used for MSW and OSX // msw_menuitem_bitmaps is used for MSW and OSX
static std::map<int, std::string> msw_menuitem_bitmaps; static std::map<int, std::string> msw_menuitem_bitmaps;
@@ -583,14 +583,38 @@ std::vector<std::vector<std::string>> read_color_pack(std::vector<std::string> c
wxColourData show_sys_picker_dialog(wxWindow *parent, const wxColourData &clr_data) wxColourData show_sys_picker_dialog(wxWindow *parent, const wxColourData &clr_data)
{ {
wxColourData data; wxColourData data = clr_data;
data.SetChooseFull(true); data.SetChooseFull(true);
data.SetColour(clr_data.GetColour());
// Load custom colors from config (support both "r,g,b,a" and "#RRGGBB" formats)
std::vector<std::string> colors = Slic3r::GUI::wxGetApp().app_config->get_custom_color_from_config();
for (int i = 0; i < (int)colors.size(); i++) {
wxColour c;
if (colors[i].find(',') != std::string::npos)
c = string_to_wxColor(colors[i]);
else
c = wxColour(colors[i]);
if (c.IsOk())
data.SetCustomColour(i, c);
}
wxColourDialog dialog(parent, &data); wxColourDialog dialog(parent, &data);
dialog.SetTitle(_L("Please choose the filament colour")); dialog.SetTitle(_L("Please choose the filament colour"));
if (dialog.ShowModal() == wxID_OK) { if (dialog.ShowModal() == wxID_OK) {
data = dialog.GetColourData(); data = dialog.GetColourData();
// Save custom colors to config (use RGBA string format for consistency)
std::vector<std::string> colors;
colors.resize(CUSTOM_COLOR_COUNT);
for (int i = 0; i < CUSTOM_COLOR_COUNT; i++) {
wxColour custom_clr = data.GetCustomColour(i);
if (custom_clr.IsOk())
colors[i] = color_to_string(custom_clr);
}
Slic3r::GUI::wxGetApp().app_config->save_custom_color_to_config(colors);
} }
return data; return data;
} }