3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX:add some missing darkmode svgs

Browse source 
Change-Id: I0a5a47e9733b534e45c65cb79ecd5b1cd2da7303
This commit is contained in:
liz.li 2022-11-29 17:35:49 +08:00 • committed by Lane.Wei
parent 1f5454052f
commit 882e06bd9b
11 changed files with 57 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/imgui/imconfig.h
View file

@ -179,6 +179,13 @@ namespace ImGui
const wchar_t PreferencesDarkButton = 0x0820;
const wchar_t PreferencesHoverDarkButton = 0x0821;
const wchar_t CircleButtonDarkIcon = 0x0822;
const wchar_t TriangleButtonDarkIcon = 0x0823;
const wchar_t FillButtonDarkIcon = 0x0824;
const wchar_t HeightRangeDarkIcon = 0x0825;
const wchar_t SphereButtonDarkIcon = 0x0826;
const wchar_t GapFillDarkIcon = 0x0827;
// void MyFunction(const char* name, const MyMatrix44& v);
}

6
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
View file

@ -465,7 +465,11 @@ void GLGizmoMmuSegmentation::on_render_input_window(float x, float y, float bott
m_imgui->text(m_desc.at("tool_type"));
bool dark_mode = wxGetApp().app_config->get("dark_color_mode") == "1";
std::array<wchar_t, 6> tool_icons = { ImGui::CircleButtonIcon,ImGui::SphereButtonIcon, ImGui::TriangleButtonIcon, ImGui::HeightRangeIcon, ImGui::FillButtonIcon, ImGui::GapFillIcon };
std::array<wchar_t, 6> tool_icons;
if (dark_mode)
tool_icons = { ImGui::CircleButtonDarkIcon, ImGui::SphereButtonDarkIcon, ImGui::TriangleButtonDarkIcon, ImGui::HeightRangeDarkIcon, ImGui::FillButtonDarkIcon, ImGui::GapFillDarkIcon };
else
tool_icons = { ImGui::CircleButtonIcon, ImGui::SphereButtonIcon, ImGui::TriangleButtonIcon, ImGui::HeightRangeIcon, ImGui::FillButtonIcon, ImGui::GapFillIcon };
std::array<wxString, 6> tool_tips = { _L("Circle"), _L("Sphere"), _L("Triangle"), _L("Height Range"), _L("Fill"), _L("Gap Fill") };
for (int i = 0; i < tool_icons.size(); i++) {
std::string str_label = std::string("");

7
src/slic3r/GUI/ImGuiWrapper.cpp
View file

@ -75,6 +75,13 @@ static const std::map<const wchar_t, std::string> font_icons = {
{ImGui::PreferencesDarkButton , "notification_preferences_dark" },
{ImGui::PreferencesHoverDarkButton , "notification_preferences_hover_dark"},
{ImGui::CircleButtonDarkIcon , "circle_paint_dark" },
{ImGui::TriangleButtonDarkIcon , "triangle_paint_dark" },
{ImGui::FillButtonDarkIcon , "fill_paint_dark" },
{ImGui::HeightRangeDarkIcon , "height_range_dark" },
{ImGui::GapFillDarkIcon , "gap_fill_dark" },
{ImGui::SphereButtonDarkIcon , "toolbar_modifier_sphere_dark" },
};
static const std::map<const wchar_t, std::string> font_icons_large = {
{ImGui::CloseNotifButton , "notification_close" },

2
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2426,7 +2426,7 @@ void StatusPanel::on_switch_speed(wxCommandEvent &event)
#else
wxPopupTransientWindow *popUp = new wxPopupTransientWindow(m_switch_speed);
#endif
popUp->SetBackgroundColour(StateColor::darkModeColorFor(0xeeeee));
popUp->SetBackgroundColour(StateColor::darkModeColorFor(0xeeeeee));
StepCtrl *step = new StepCtrl(popUp, wxID_ANY);
wxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
sizer->Add(step, 1, wxEXPAND, 0);