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

TopBar: Fixed Rescale() function

Browse Source
This commit is contained in:
YuSanka 2024-01-23 17:06:52 +01:00 committed by David Kocik
parent f716497318
commit 5804d5aa71
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/slic3r/GUI/TopBar.cpp
View File

@ -211,16 +211,20 @@ void TopBarItemsCtrl::CreateSearch()
wxGetApp().searcher().set_search_input(m_search); wxGetApp().searcher().set_search_input(m_search);
} }
void TopBarItemsCtrl::update_margins()
{
int em = em_unit(this);
m_btn_margin = std::lround(0.9 * em);
m_line_margin = std::lround(0.1 * em);
}
TopBarItemsCtrl::TopBarItemsCtrl(wxWindow *parent) : TopBarItemsCtrl::TopBarItemsCtrl(wxWindow *parent) :
wxControl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxTAB_TRAVERSAL) wxControl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxTAB_TRAVERSAL)
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetDoubleBuffered(true); SetDoubleBuffered(true);
#endif //__WINDOWS__ #endif //__WINDOWS__
update_margins();
int em = em_unit(this);
m_btn_margin = std::lround(0.9 * em);
m_line_margin = std::lround(0.1 * em);
m_sizer = new wxFlexGridSizer(2); m_sizer = new wxFlexGridSizer(2);
m_sizer->AddGrowableCol(0); m_sizer->AddGrowableCol(0);
@ -330,9 +334,14 @@ void TopBarItemsCtrl::UpdateMode()
void TopBarItemsCtrl::Rescale() void TopBarItemsCtrl::Rescale()
{ {
update_margins();
int em = em_unit(this); int em = em_unit(this);
m_btn_margin = std::lround(0.3 * em); m_search->SetMinSize(wxSize(4 * em, -1));
m_line_margin = std::lround(0.1 * em); m_search->SetMaxSize(wxSize(42 * em, -1));
m_search->Rescale();
m_sizer->SetItemMinSize(1, wxSize(42 * em, -1));
m_buttons_sizer->SetVGap(m_btn_margin); m_buttons_sizer->SetVGap(m_btn_margin);
m_buttons_sizer->SetHGap(m_btn_margin); m_buttons_sizer->SetHGap(m_btn_margin);

2
src/slic3r/GUI/TopBar.hpp
View File

@ -93,6 +93,8 @@ private:
int m_selection {-1}; int m_selection {-1};
int m_btn_margin; int m_btn_margin;
int m_line_margin; int m_line_margin;
void update_margins();
}; };
class TopBar : public wxBookCtrlBase class TopBar : public wxBookCtrlBase