juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 10:32:20 +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

21
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@@ -1932,35 +1932,38 @@ void GLGizmoMeasure::show_distance_xyz_ui()
}
};
auto add_edit_distance_xyz_box = [this](Vec3d &distance) {
m_imgui->disabled_begin(m_hit_different_volumes.size() == 1);
{
//m_imgui->disabled_begin(m_hit_different_volumes.size() == 1);
//{
if (m_measure_mode == EMeasureMode::ONLY_MEASURE) {
m_can_set_xyz_distance = false;
}
m_imgui->disabled_begin(!m_can_set_xyz_distance);
bool volume = m_hit_different_volumes.size() == 1;
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
m_imgui->text_colored(ImGuiWrapper::COL_RED, "X:");
m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::X()), "X:"); // ORCA match axis color
ImGui::TableSetColumnIndex(1);
ImGui::PushItemWidth(m_input_size_max);
m_imgui->disabled_begin(volume || !m_can_set_xyz_distance); // ORCA disable only input box othervise axis colors rendered dimmed
ImGui::BBLInputDouble("##measure_distance_x", &m_buffered_distance[0], 0.0f, 0.0f, "%.2f");
m_imgui->disabled_end();
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
m_imgui->text_colored(ImGuiWrapper::COL_GREEN, "Y:");
m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::Y()), "Y:"); // ORCA match axis color
ImGui::TableSetColumnIndex(1);
m_imgui->disabled_begin(volume || !m_can_set_xyz_distance); // ORCA disable only input box othervise axis colors rendered dimmed
ImGui::BBLInputDouble("##measure_distance_y", &m_buffered_distance[1], 0.0f, 0.0f, "%.2f");
m_imgui->disabled_end();
m_imgui->disabled_begin(!(m_same_model_object && m_can_set_xyz_distance));
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0);
m_imgui->text_colored(ImGuiWrapper::COL_BLUE, "Z:");
m_imgui->text_colored(ImGuiWrapper::to_ImVec4(ColorRGBA::Z()), "Z:"); // ORCA match axis color
ImGui::TableSetColumnIndex(1);
m_imgui->disabled_begin(volume || !(m_same_model_object && m_can_set_xyz_distance)); // ORCA disable only input box othervise axis colors rendered dimmed
ImGui::BBLInputDouble("##measure_distance_z", &m_buffered_distance[2], 0.0f, 0.0f, "%.2f");
m_imgui->disabled_end();
}
m_imgui->disabled_end();
//}
//m_imgui->disabled_end();
if (m_last_active_item_imgui != m_current_active_imgui_id && m_hit_different_volumes.size() == 2) {
Vec3d displacement = Vec3d::Zero();
if (std::abs(m_buffered_distance[0] - distance[0]) > EPSILON) {