mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-19 21:51:06 +00:00
Merge branch 'main' into belt-printer
This commit is contained in:
241 files changed
+1047
-1771
No files matched your search
@@ -177,6 +177,8 @@ extern wxPopupWindow* wxCurrentPopupWindow;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
using namespace std::string_view_literals;
|
||||
|
||||
static constexpr const float TRACKBALLSIZE = 0.8f;
|
||||
|
||||
static Slic3r::ColorRGBA DEFAULT_BG_LIGHT_COLOR = { 0.906f, 0.906f, 0.906f, 1.0f };
|
||||
@@ -184,12 +186,12 @@ static Slic3r::ColorRGBA DEFAULT_BG_LIGHT_COLOR_DARK = { 0.329f, 0.329f, 0.353f,
|
||||
static Slic3r::ColorRGBA ERROR_BG_LIGHT_COLOR = { 0.753f, 0.192f, 0.039f, 1.0f };
|
||||
static Slic3r::ColorRGBA ERROR_BG_LIGHT_COLOR_DARK = { 0.753f, 0.192f, 0.039f, 1.0f };
|
||||
|
||||
void GLCanvas3D::update_render_colors()
|
||||
void Slic3r::GUI::GLCanvas3D::update_render_colors()
|
||||
{
|
||||
DEFAULT_BG_LIGHT_COLOR = ImGuiWrapper::from_ImVec4(RenderColor::colors[RenderCol_3D_Background]);
|
||||
}
|
||||
|
||||
void GLCanvas3D::load_render_colors()
|
||||
void Slic3r::GUI::GLCanvas3D::load_render_colors()
|
||||
{
|
||||
RenderColor::colors[RenderCol_3D_Background] = ImGuiWrapper::to_ImVec4(DEFAULT_BG_LIGHT_COLOR);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user