From 882e06bd9b83735d0aefed62e636c734176b3a7d Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Tue, 29 Nov 2022 17:35:49 +0800 Subject: [PATCH] FIX:add some missing darkmode svgs Change-Id: I0a5a47e9733b534e45c65cb79ecd5b1cd2da7303 --- resources/images/circle_paint_dark.svg | 3 +++ resources/images/fill_paint_dark.svg | 7 +++++++ resources/images/gap_fill_dark.svg | 14 ++++++++++++++ resources/images/height_range_dark.svg | 4 ++++ resources/images/plate_close_dark.svg | 6 +----- resources/images/toolbar_modifier_sphere_dark.svg | 5 +++++ resources/images/triangle_paint_dark.svg | 3 +++ src/imgui/imconfig.h | 7 +++++++ src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp | 6 +++++- src/slic3r/GUI/ImGuiWrapper.cpp | 7 +++++++ src/slic3r/GUI/StatusPanel.cpp | 2 +- 11 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 resources/images/circle_paint_dark.svg create mode 100644 resources/images/fill_paint_dark.svg create mode 100644 resources/images/gap_fill_dark.svg create mode 100644 resources/images/height_range_dark.svg create mode 100644 resources/images/toolbar_modifier_sphere_dark.svg create mode 100644 resources/images/triangle_paint_dark.svg diff --git a/resources/images/circle_paint_dark.svg b/resources/images/circle_paint_dark.svg new file mode 100644 index 000000000..d96f4ed4b --- /dev/null +++ b/resources/images/circle_paint_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/fill_paint_dark.svg b/resources/images/fill_paint_dark.svg new file mode 100644 index 000000000..6e8e76f6c --- /dev/null +++ b/resources/images/fill_paint_dark.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/gap_fill_dark.svg b/resources/images/gap_fill_dark.svg new file mode 100644 index 000000000..09e898ce8 --- /dev/null +++ b/resources/images/gap_fill_dark.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/resources/images/height_range_dark.svg b/resources/images/height_range_dark.svg new file mode 100644 index 000000000..5b352af37 --- /dev/null +++ b/resources/images/height_range_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/plate_close_dark.svg b/resources/images/plate_close_dark.svg index 7d546a6c3..8fb4bdd6a 100644 --- a/resources/images/plate_close_dark.svg +++ b/resources/images/plate_close_dark.svg @@ -1,8 +1,4 @@ - - - - - + diff --git a/resources/images/toolbar_modifier_sphere_dark.svg b/resources/images/toolbar_modifier_sphere_dark.svg new file mode 100644 index 000000000..10f64738a --- /dev/null +++ b/resources/images/toolbar_modifier_sphere_dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/images/triangle_paint_dark.svg b/resources/images/triangle_paint_dark.svg new file mode 100644 index 000000000..0efbc898b --- /dev/null +++ b/resources/images/triangle_paint_dark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h index 1ee33d098..4c32a701a 100644 --- a/src/imgui/imconfig.h +++ b/src/imgui/imconfig.h @@ -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); } diff --git a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp index 46838c223..8c2d294c1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp @@ -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 tool_icons = { ImGui::CircleButtonIcon,ImGui::SphereButtonIcon, ImGui::TriangleButtonIcon, ImGui::HeightRangeIcon, ImGui::FillButtonIcon, ImGui::GapFillIcon }; + std::array 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 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(""); diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 3195f0440..8093210e4 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -75,6 +75,13 @@ static const std::map 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 font_icons_large = { {ImGui::CloseNotifButton , "notification_close" }, diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 441a09a08..4060bec80 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -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);