3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix the app can not launch issue under case-sensitive APFS on macos

Browse source 
Change-Id: I849bd8023c0973b0603e1cbaadbd7035c276a745
(cherry picked from commit 5d08ccd146eb818c83825e28337834a6abdf4fbe)
This commit is contained in:
lane.wei 2022-07-29 15:04:32 +08:00 • committed by Lane.Wei
parent e6131fc5f7
commit 92ad7ff1d0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/slic3r/GUI/ImGuiWrapper.cpp
View file

@ -58,7 +58,7 @@ static const std::map<const wchar_t, std::string> font_icons = {
{ImGui::SliderFloatEditBtnIcon, "edit_button" }, {ImGui::SliderFloatEditBtnIcon, "edit_button" },
#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT #endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
{ImGui::CircleButtonIcon , "circle_paint" }, {ImGui::CircleButtonIcon , "circle_paint" },
{ImGui::TriangleButtonIcon , "Triangle_paint" }, {ImGui::TriangleButtonIcon , "triangle_paint" },
{ImGui::FillButtonIcon , "fill_paint" }, {ImGui::FillButtonIcon , "fill_paint" },
{ImGui::HeightRangeIcon , "height_range" }, {ImGui::HeightRangeIcon , "height_range" },
{ImGui::GapFillIcon , "gap_fill" }, {ImGui::GapFillIcon , "gap_fill" },
@ -196,7 +196,7 @@ bool slider_behavior(ImGuiID id, const ImRect& region, const ImS32 v_min, const
mouse_wheel_responsive_region = ImRect(region.Min - ImVec2(0, handle_sz.y), region.Max + ImVec2(0, handle_sz.y)); mouse_wheel_responsive_region = ImRect(region.Min - ImVec2(0, handle_sz.y), region.Max + ImVec2(0, handle_sz.y));
if (ImGui::ItemHoverable(mouse_wheel_responsive_region, id)) { if (ImGui::ItemHoverable(mouse_wheel_responsive_region, id)) {
#ifdef __APPLE__ #ifdef __APPLE__
if (io.KeyShift) if (io.KeyShift)
v_new = ImClamp(*out_value - 5 * (ImS32) (context.IO.MouseWheel), v_min, v_max); v_new = ImClamp(*out_value - 5 * (ImS32) (context.IO.MouseWheel), v_min, v_max);
else if (io.KeyCtrl) else if (io.KeyCtrl)
v_new = ImClamp(*out_value + 5 * (ImS32) (context.IO.MouseWheel), v_min, v_max); v_new = ImClamp(*out_value + 5 * (ImS32) (context.IO.MouseWheel), v_min, v_max);
@ -236,7 +236,7 @@ bool slider_behavior(ImGuiID id, const ImRect& region, const ImS32 v_min, const
{ {
v_new = fixed_value; v_new = fixed_value;
} }
// apply result, output value // apply result, output value
if (*out_value != v_new) if (*out_value != v_new)
{ {
@ -606,7 +606,7 @@ bool ImGuiWrapper::bbl_slider_float_style(const std::string &label, float *v, fl
bool ImGuiWrapper::bbl_slider_float(const std::string& label, float* v, float v_min, float v_max, const char* format, float power, bool clamp, const wxString& tooltip) bool ImGuiWrapper::bbl_slider_float(const std::string& label, float* v, float v_min, float v_max, const char* format, float power, bool clamp, const wxString& tooltip)
{ {
const float max_tooltip_width = ImGui::GetFontSize() * 20.0f; const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
// let the label string start with "##" to hide the automatic label from ImGui::SliderFloat() // let the label string start with "##" to hide the automatic label from ImGui::SliderFloat()
@ -969,7 +969,7 @@ bool ImGuiWrapper::combo(const wxString& label, const std::vector<std::string>&
return res; return res;
} }
// Scroll up for one item // Scroll up for one item
static void scroll_up() static void scroll_up()
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
@ -981,7 +981,7 @@ static void scroll_up()
ImGui::SetScrollY(win_top - item_size_y); ImGui::SetScrollY(win_top - item_size_y);
} }
// Scroll down for one item // Scroll down for one item
static void scroll_down() static void scroll_down()
{ {
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
@ -1229,7 +1229,7 @@ void ImGuiWrapper::search_list(const ImVec2& size_, bool (*items_getter)(int, co
{ {
int& hovered_id = view_params.hovered_id; int& hovered_id = view_params.hovered_id;
// ImGui::ListBoxHeader("", size); // ImGui::ListBoxHeader("", size);
{ {
// rewrote part of function to add a TextInput instead of label Text // rewrote part of function to add a TextInput instead of label Text
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindow();