Deleted unnecessary size settings
This commit is contained in:
parent
f029ed8fe1
commit
b099ca1d4e
2 changed files with 3 additions and 6 deletions
src/slic3r/GUI
|
@ -46,7 +46,6 @@ KBShortcutsDialog::KBShortcutsDialog()
|
||||||
main_grid_sizer->Add(r_sizer, 0);
|
main_grid_sizer->Add(r_sizer, 0);
|
||||||
|
|
||||||
m_head_bitmaps.reserve(m_full_shortcuts.size());
|
m_head_bitmaps.reserve(m_full_shortcuts.size());
|
||||||
const wxSize topic_size = wxSize(10 * wxGetApp().em_unit(), -1);
|
|
||||||
|
|
||||||
for (auto& shortcut : m_full_shortcuts)
|
for (auto& shortcut : m_full_shortcuts)
|
||||||
{
|
{
|
||||||
|
@ -59,7 +58,7 @@ KBShortcutsDialog::KBShortcutsDialog()
|
||||||
hsizer->Add(m_head_bitmaps.back(), 0, wxEXPAND | wxLEFT | wxRIGHT, 15);
|
hsizer->Add(m_head_bitmaps.back(), 0, wxEXPAND | wxLEFT | wxRIGHT, 15);
|
||||||
|
|
||||||
// head
|
// head
|
||||||
wxStaticText* head = new wxStaticText(panel, wxID_ANY, shortcut.first, wxDefaultPosition, topic_size);
|
wxStaticText* head = new wxStaticText(panel, wxID_ANY, shortcut.first);
|
||||||
head->SetFont(head_font);
|
head->SetFont(head_font);
|
||||||
hsizer->Add(head, 0, wxALIGN_CENTER_VERTICAL);
|
hsizer->Add(head, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
|
||||||
|
|
|
@ -524,8 +524,7 @@ void ConfigOptionsGroup::msw_rescale()
|
||||||
{
|
{
|
||||||
auto label = dynamic_cast<wxStaticText*>(label_item->GetWindow());
|
auto label = dynamic_cast<wxStaticText*>(label_item->GetWindow());
|
||||||
if (label != nullptr) {
|
if (label != nullptr) {
|
||||||
const int label_height = int(1.5f*label->GetFont().GetPixelSize().y + 0.5f);
|
label->SetMinSize(wxSize(label_width*em, -1));
|
||||||
label->SetMinSize(wxSize(label_width*em, /*-1*/label_height));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (label_item->IsSizer()) // case when we have near_label_widget
|
else if (label_item->IsSizer()) // case when we have near_label_widget
|
||||||
|
@ -535,8 +534,7 @@ void ConfigOptionsGroup::msw_rescale()
|
||||||
{
|
{
|
||||||
auto label = dynamic_cast<wxStaticText*>(l_item->GetWindow());
|
auto label = dynamic_cast<wxStaticText*>(l_item->GetWindow());
|
||||||
if (label != nullptr) {
|
if (label != nullptr) {
|
||||||
const int label_height = int(1.5f*label->GetFont().GetPixelSize().y + 0.5f);
|
label->SetMinSize(wxSize(label_width*em, -1));
|
||||||
label->SetMinSize(wxSize(label_width*em, /*-1*/label_height));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue