juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Color & Icon fixes / improvements (#9773)

Browse Source 
* init

* update

* update

* revert changes for stepmesh dialog

* make highlight arrow more obvious

* reset to zero icons

* modernize return icon

* better dark mode icon for project page

* fix return arrow

* revert changes for hyperlinks

* update

* Update SelectMachine.cpp

* Update SendToPrinter.cpp

* update

* update plate icons

* dragcanvas dark mode support

* revert changes for calibration page

* revert changes for bind dialog

* Update BindDialog.cpp

* fix green text on bbl calibration window

* Update AmsMappingPopup.cpp

* match measure axis color

* fix

* update

* Update AmsMappingPopup.cpp

* revert color change for hyperlink

* Update NotificationManager.cpp

* update

* add icon for resonance avoidance

* update

* Fix wrong icon color after switching dark mode

---------

Co-authored-by: Noisyfox <timemanager.rick@gmail.com>
This commit is contained in:
yw4z
2025-07-17 10:26:55 +03:00
committed by GitHub
parent 3e186d2393
commit 0726819547
40 changed files with 102 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/slic3r/GUI/GLCanvas3D.cpp
View File

@@ -8219,7 +8219,7 @@ void GLCanvas3D::_render_return_toolbar() const
float font_size = ImGui::GetFontSize();
ImVec2 real_size = ImVec2(font_size * 4, font_size * 1.7);
ImVec2 button_icon_size = ImVec2(font_size * 1.3, font_size * 1.3);
ImVec2 button_icon_size = ImVec2(font_size * .55, font_size * 1.1); // ORCA
ImGuiWrapper& imgui = *wxGetApp().imgui();
Size cnv_size = get_canvas_size();
@@ -8235,12 +8235,16 @@ void GLCanvas3D::_render_return_toolbar() const
imgui.set_next_window_size(window_width, window_height, ImGuiCond_Always);
#endif
ImVec4 fg_color = m_is_dark ? ImVec4(1.f, 1.f, 1.f, 0.88f) : ImVec4(50 / 255.f, 58 / 255.f, 61 / 255.f, 1.f);
ImVec4 bg_color = m_is_dark ? ImGuiWrapper::COL_TOOLBAR_BG_DARK : ImGuiWrapper::COL_TOOLBAR_BG;
ImVec4 bg_color_hover = bg_color + (m_is_dark ? ImVec4(.03f, .03f, .03f, 0) : ImVec4(-.02f, -.02f, -.02f, 0));
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 18.0f);
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.149f, 0.180f, 0.188f, 0.3f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.149f, 0.180f, 0.188f, 0.15f));
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0.149f, 0.180f, 0.188f, 0.5f));
ImGui::PushStyleColor(ImGuiCol_Button, bg_color); // ORCA Toolbar color
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, bg_color_hover);
ImGui::PushStyleColor(ImGuiCol_ButtonActive, bg_color);
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.0f, 0.0f, 0.0f, 0.0f));
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_Text, fg_color);
imgui.begin(_L("Assembly Return"), ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoBackground
| ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse);
@@ -8252,7 +8256,7 @@ void GLCanvas3D::_render_return_toolbar() const
ImVec2 uv1 = ImVec2(1.0f, 1.0f);
ImVec4 bg_col = ImVec4(0.0f, 0.0f, 0.0f, 0.0f);
ImVec4 tint_col = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
ImVec4 tint_col = fg_color; // icon color
ImVec2 margin = ImVec2(10.0f, 5.0f);
if (ImGui::ImageTextButton(real_size,_utf8(L("Return")).c_str(), m_return_toolbar.get_return_texture_id(), button_icon_size, uv0, uv1, -1, bg_col, tint_col, margin)) {
@@ -8363,7 +8367,7 @@ void GLCanvas3D::_render_paint_toolbar() const
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(spacing, spacing));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0);
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(spacing, 0));
ImGui::PushStyleColor(ImGuiCol_WindowBg, { 0.f, 0.f, 0.f, 0.4f });
ImGui::PushStyleColor(ImGuiCol_WindowBg, m_is_dark ? ImGuiWrapper::COL_TOOLBAR_BG_DARK : ImGuiWrapper::COL_TOOLBAR_BG); // ORCA Toolbar color
imgui.set_next_window_pos(0.5f * canvas_w, 0, ImGuiCond_Always, 0.5f, 0.0f);
float constraint_window_width = canvas_w - 2 * return_button_margin;