mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-20 07:11:12 -06:00 
			
		
		
		
	ENH: use wxFont::AddPrivateFont to load fonts for linux
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
This commit is contained in:
		
							parent
							
								
									8f330d8b82
								
							
						
					
					
						commit
						27d2008037
					
				
					 3 changed files with 19 additions and 2 deletions
				
			
		|  | @ -1,3 +1,4 @@ | |||
| #include "libslic3r/Utils.hpp" | ||||
| #include "Label.hpp" | ||||
| #include "StaticBox.hpp" | ||||
| 
 | ||||
|  | @ -41,6 +42,18 @@ wxFont Label::Body_9; | |||
| 
 | ||||
| void Label::initSysFont() | ||||
| { | ||||
| #ifdef __linux__ | ||||
|     const std::string& resource_path = Slic3r::resources_dir(); | ||||
|     wxString font_path = wxString::FromUTF8(resource_path+"/fonts/HarmonyOS_Sans_SC_Bold.ttf"); | ||||
|     bool result = wxFont::AddPrivateFont(font_path); | ||||
|     //BOOST_LOG_TRIVIAL(info) << boost::format("add font of HarmonyOS_Sans_SC_Bold returns %1%")%result;
 | ||||
|     printf("add font of HarmonyOS_Sans_SC_Bold returns %d\n", result); | ||||
|     font_path = wxString::FromUTF8(resource_path+"/fonts/HarmonyOS_Sans_SC_Regular.ttf"); | ||||
|     result = wxFont::AddPrivateFont(font_path); | ||||
|     //BOOST_LOG_TRIVIAL(info) << boost::format("add font of HarmonyOS_Sans_SC_Regular returns %1%")%result;
 | ||||
|     printf("add font of HarmonyOS_Sans_SC_Regular returns %d\n", result); | ||||
| #endif | ||||
| 
 | ||||
|     Head_24 = Label::sysFont(24, true); | ||||
|     Head_20 = Label::sysFont(20, true); | ||||
|     Head_18 = Label::sysFont(18, true); | ||||
|  | @ -215,7 +228,7 @@ Label::Label(wxWindow *parent, wxFont const &font, wxString const &text, long st | |||
|     SetBackgroundColour(StaticBox::GetParentBackgroundColor(parent)); | ||||
|     if (style & LB_PROPAGATE_MOUSE_EVENT) { | ||||
|         for (auto evt : { | ||||
|             wxEVT_LEFT_UP, wxEVT_LEFT_DOWN})  | ||||
|             wxEVT_LEFT_UP, wxEVT_LEFT_DOWN}) | ||||
|             Bind(evt, [this] (auto & e) { GetParent()->GetEventHandler()->ProcessEventLocally(e); }); | ||||
|         }; | ||||
|     } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 lane.wei
						lane.wei