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

ENH:Text not centered on mac15

Browse Source 
jira: STUDIO-11056
Change-Id: I1c651421f8914a25707ad5b5c1d3e3d56c2df959
(cherry picked from commit 7af3eba50047c4b5f852f2ac3814243543a5019a)
This commit is contained in:
zhou.xu
2025-03-23 16:59:44 +08:00
committed by Noisyfox
parent 0b4b39f8ed
commit 13d3cfda63
5 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/MacUtils.hpp
View File

@@ -4,7 +4,7 @@
namespace Slic3r {
bool is_macos_support_boost_add_file_log();
int is_mac_version_15();
}
#endif

16
src/libslic3r/MacUtils.mm
View File

@@ -6,10 +6,18 @@ namespace Slic3r {
bool is_macos_support_boost_add_file_log()
{
if (@available(macOS 12.0, *)) {
return true;
} else {
return false;
}
return true;
} else {
return false;
}
}
int is_mac_version_15()
{
if (@available(macOS 15.0, *)) {//This code runs on macOS 15 or later.
return true;
} else {
return false;
}
}
}; // namespace Slic3r

2
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@@ -583,8 +583,6 @@ MeshErrorsInfo ObjectList::get_mesh_errors_info(wxString* sidebar_info /*= nullp
else
return { "", "" };
}
assert(obj_idx >= 0);
return get_mesh_errors_info(obj_idx, vol_idx, sidebar_info, non_manifold_edges);
}

9
src/slic3r/GUI/Widgets/Button.cpp
View File

@@ -2,7 +2,9 @@
#include "Label.hpp"
#include <wx/dcgraph.h>
#ifdef __APPLE__
#include "libslic3r/MacUtils.hpp"
#endif
BEGIN_EVENT_TABLE(Button, StaticBox)
EVT_LEFT_DOWN(Button::mouseDown)
@@ -347,6 +349,11 @@ void Button::render(wxDC& dc)
#endif
#ifdef __WXOSX__
pt.y -= textSize.x / 2;
#endif
#ifdef __APPLE__
if (Slic3r::is_mac_version_15()) {
pt.y -= FromDIP(1);
}
#endif
dc.DrawText(text, pt);
}

19
src/slic3r/GUI/Widgets/SwitchButton.cpp
View File

@@ -5,6 +5,9 @@
#include "../wxExtensions.hpp"
#include "../Utils/MacDarkMode.hpp"
#include "../Utils/WxFontUtils.hpp"
#ifdef __APPLE__
#include "libslic3r/MacUtils.hpp"
#endif
#include <wx/dcmemory.h>
#include <wx/dcclient.h>
@@ -140,9 +143,21 @@ void SwitchButton::Rescale()
dc2.DrawRoundedRectangle(wxRect({ i == 0 ? BS : (trackSize.x - thumbSize.x - BS), BS}, thumbSize), thumbSize.y / 2);
}
memdc.SetTextForeground(text_color.colorForStates(state ^ StateColor::Checked));
memdc.DrawText(labels[0], {BS + (thumbSize.x - textSize[0].x) / 2, BS + (thumbSize.y - textSize[0].y) / 2});
auto text_y = BS + (thumbSize.y - textSize[0].y) / 2;
#ifdef __APPLE__
if (Slic3r::is_mac_version_15()) {
text_y -= FromDIP(2);
}
#endif
memdc.DrawText(labels[0], {BS + (thumbSize.x - textSize[0].x) / 2, text_y});
memdc.SetTextForeground(text_color2.count() == 0 ? text_color.colorForStates(state) : text_color2.colorForStates(state));
memdc.DrawText(labels[1], {trackSize.x - thumbSize.x - BS + (thumbSize.x - textSize[1].x) / 2, BS + (thumbSize.y - textSize[1].y) / 2});
auto text_y_1 = BS + (thumbSize.y - textSize[1].y) / 2;
#ifdef __APPLE__
if (Slic3r::is_mac_version_15()) {
text_y_1 -= FromDIP(2);
}
#endif
memdc.DrawText(labels[1], {trackSize.x - thumbSize.x - BS + (thumbSize.x - textSize[1].x) / 2, text_y_1});
memdc.SelectObject(wxNullBitmap);
#ifdef __WXOSX__
bmp = wxBitmap(bmp.ConvertToImage(), -1, scale);