Github-Mirrors/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-03 17:05:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflicts after merge with master

Browse Source
This commit is contained in:
enricoturri1966
2020-08-03 08:56:58 +02:00
parent 1532920d81 a29b00a0b4
commit 69a0a1c96e
5 changed files with 57 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View File

@@ -512,9 +512,7 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
window_width = std::max(window_width, button_width);
auto draw_text_with_caption = [this, &caption_max](const wxString& caption, const wxString& text) {
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiWrapper::COL_ORANGE_LIGHT);
m_imgui->text(caption);
ImGui::PopStyleColor();
m_imgui->text_colored(ImGuiWrapper::COL_ORANGE_LIGHT, caption);
ImGui::SameLine(caption_max);
m_imgui->text(text);
};