3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

FIX: font of object list

Browse source 
Change-Id: Ifb198a8b6af89ee9a089d88d98d495821b5fce7e
This commit is contained in:
chunmao.guo 2022-08-05 18:39:02 +08:00 • committed by Lane.Wei
parent b96ca57fde
commit 21d13646d8
5 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/ExtraRenderers.cpp
View file

@ -171,7 +171,10 @@ wxSize BitmapTextRenderer::GetSize() const
} }
else else
#endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL #endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL
{
size = GetTextExtent(m_value.GetText()); size = GetTextExtent(m_value.GetText());
size.x = size.x * 9 / 8;
}
if (m_value.GetBitmap().IsOk()) if (m_value.GetBitmap().IsOk())
size.x += m_value.GetBitmap().GetWidth() + 4; size.x += m_value.GetBitmap().GetWidth() + 4;

5
src/slic3r/GUI/GUI_ObjectList.cpp
View file

@ -26,6 +26,7 @@
#include <wx/progdlg.h> #include <wx/progdlg.h>
#include <wx/listbook.h> #include <wx/listbook.h>
#include <wx/numformatter.h> #include <wx/numformatter.h>
#include <wx/headerctrl.h>
#include "slic3r/Utils/FixModelByWin10.hpp" #include "slic3r/Utils/FixModelByWin10.hpp"
#include "libslic3r/Format/bbs_3mf.hpp" #include "libslic3r/Format/bbs_3mf.hpp"
@ -75,6 +76,10 @@ ObjectList::ObjectList(wxWindow* parent) :
wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE) wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE)
{ {
wxGetApp().UpdateDVCDarkUI(this, true); wxGetApp().UpdateDVCDarkUI(this, true);
SetFont(Label::sysFont(13));
#ifdef __WXMSW__
GenericGetHeader()->SetFont(Label::sysFont(13));
#endif
// create control // create control
create_objects_ctrl(); create_objects_ctrl();

1
src/slic3r/GUI/Preferences.cpp
View file

@ -284,7 +284,6 @@ wxBoxSizer *PreferencesDialog::create_item_loglevel_combobox(wxString title, wxW
std::vector<wxString>::iterator iter; std::vector<wxString>::iterator iter;
for (iter = vlist.begin(); iter != vlist.end(); iter++) { combobox->Append(*iter); } for (iter = vlist.begin(); iter != vlist.end(); iter++) { combobox->Append(*iter); }
m_sizer_combox->Add(combobox, 0, wxALIGN_CENTER, 0);
auto severity_level = app_config->get("severity_level"); auto severity_level = app_config->get("severity_level");
if (!severity_level.empty()) { combobox->SetValue(severity_level); } if (!severity_level.empty()) { combobox->SetValue(severity_level); }

1
src/slic3r/Utils/MacDarkMode.hpp
View file

@ -13,7 +13,6 @@ extern void set_miniaturizable(void * window);
void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &)); void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &));
void set_title_colour_after_set_title(); void set_title_colour_after_set_title();
void initGestures(void * view, wxEvtHandler * handler); void initGestures(void * view, wxEvtHandler * handler);
#endif #endif

13
src/slic3r/Utils/MacDarkMode.mm
View file

@ -1,4 +1,6 @@
#import "MacDarkMode.hpp" #import "MacDarkMode.hpp"
#include "../GUI/Widgets/Label.hpp"
#include "wx/osx/core/cfstring.h" #include "wx/osx/core/cfstring.h"
#import <algorithm> #import <algorithm>
@ -178,6 +180,17 @@ void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*ca
@end @end
/* Font for wxTextCtrl */
@implementation NSTableHeaderCell (Font)
- (NSFont*) font
{
return Label::sysFont(13).OSXGetNSFont();
}
@end
/* remove focused border for wxTextCtrl */ /* remove focused border for wxTextCtrl */
@implementation NSTextField (FocusRing) @implementation NSTextField (FocusRing)