PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-15 01:22:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ys_hdpi'

Browse Source
This commit is contained in:
bubnikv
2019-02-20 16:20:30 +01:00
parent 3901ac47d1 8a31f9d658
commit c55629259a
30 changed files with 413 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/GUI_App.cpp
View File

@@ -165,10 +165,10 @@ bool GUI_App::OnInit()
// ! Temporary workaround for the correct behavior of the Scrolled sidebar panel
// Do this "manipulations" only once ( after (re)create of the application )
if (plater_ && sidebar().obj_list()->GetMinHeight() > 200)
if (plater_ && sidebar().obj_list()->GetMinHeight() > 15 * wxGetApp().em_unit())
{
wxWindowUpdateLocker noUpdates_sidebar(&sidebar());
sidebar().obj_list()->SetMinSize(wxSize(-1, 200));
sidebar().obj_list()->SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
// !!! to correct later layouts
update_mode(); // update view mode after fix of the object_list size
@@ -251,6 +251,7 @@ void GUI_App::init_fonts()
{
m_small_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
m_bold_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT).Bold();
#ifdef __WXMAC__
m_small_font.SetPointSize(11);
m_bold_font.SetPointSize(13);