GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 13:52:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX on MAC (made by Filip)

Browse Source
This commit is contained in:
Slic3rPE 2021-09-23 19:32:08 +02:00
parent 615a5a17f9
commit e5f7b3b3fd
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
View File

@ -15,10 +15,13 @@
#include "nanosvg/nanosvg.h" // load SVG file #include "nanosvg/nanosvg.h" // load SVG file
#include <wx/font.h> #include <wx/font.h>
#include <wx/fontutil.h>
#include <wx/fontdlg.h> #include <wx/fontdlg.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <wx/uri.h>
#include <CoreText/CTFont.h> #include <CoreText/CTFont.h>
#include <wx/osx/core/cfdictionary.h>
#endif // apple #endif // apple
namespace Slic3r { namespace Slic3r {
@ -322,7 +325,10 @@ void GLGizmoEmboss::draw_window()
draw_font_list(); draw_font_list();
if (ImGui::Button(_L("choose font").c_str())) choose_font_by_wxdialog(); if (ImGui::Button(_L("choose font").c_str()))
choose_font_by_wxdialog();
//wxGetApp().plater()->CallAfter([this]{choose_font_by_wxdialog();});
//ImGui::SameLine(); //ImGui::SameLine();
//if (ImGui::Button(_L("use system font").c_str())) { //if (ImGui::Button(_L("use system font").c_str())) {
@ -455,7 +461,7 @@ bool GLGizmoEmboss::choose_font_by_wxdialog() {
data.SetInitialFont(data.GetChosenFont()); data.SetInitialFont(data.GetChosenFont());
wxFontDialog font_dialog(wxGetApp().mainframe, data); wxFontDialog font_dialog(wxGetApp().mainframe, data);
//static wxFontDialog font_dialog(nullptr); //static wxFontDialog font_dialog(nullptr);
font_dialog.SetTitle(_L("Select font for Emboss")); //font_dialog.SetTitle(_L("Select font for Emboss"));
if (font_dialog.ShowModal() != wxID_OK) return false; if (font_dialog.ShowModal() != wxID_OK) return false;
data = font_dialog.GetFontData(); data = font_dialog.GetFontData();
wxFont font = data.GetChosenFont(); wxFont font = data.GetChosenFont();
@ -623,11 +629,17 @@ std::optional<Emboss::Font> WxFontUtils::load_font(const wxFont &font)
return {}; return {};
#elif __APPLE__ #elif __APPLE__
const wxNativeFontInfo *info = font.GetNativeFontInfo(); const wxNativeFontInfo *info = font.GetNativeFontInfo();
if(info == nullptr) return {};
CTFontDescriptorRef descriptor = info->GetCTFontDescriptor(); CTFontDescriptorRef descriptor = info->GetCTFontDescriptor();
CFDictionaryRef attribs = CTFontDescriptorCopyAttributes(descriptor); CFURLRef typeref = (CFURLRef)CTFontDescriptorCopyAttribute(descriptor, kCTFontURLAttribute);
CFStringRef url = (CFStringRef)CTFontDescriptorCopyAttribute(descriptor, kCTFontURLAttribute); CFStringRef url = CFURLGetString(typeref);
std::string str(CFStringGetCStringPtr(CFURLGetString(anUrl),kCFStringEncodingUTF8)); if(url == NULL) return {};
return Emboss::load_font(str); wxString file_uri;
wxCFTypeRef(url).GetValue(file_uri);
std::string file_path(wxURI::Unescape(file_uri).c_str());
size_t start = std::string("file://").size();
file_path = file_path.substr(start, file_path.size()-start);
return Emboss::load_font(file_path.c_str());
#endif #endif
} }