From b099ca1d4e9eddaf9f5bbe9b1d32e8e6f626b292 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Wed, 15 May 2019 15:41:12 +0200 Subject: [PATCH] Deleted unnecessary size settings --- src/slic3r/GUI/KBShortcutsDialog.cpp | 3 +-- src/slic3r/GUI/OptionsGroup.cpp | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/KBShortcutsDialog.cpp b/src/slic3r/GUI/KBShortcutsDialog.cpp index a7883f739..a7b011013 100644 --- a/src/slic3r/GUI/KBShortcutsDialog.cpp +++ b/src/slic3r/GUI/KBShortcutsDialog.cpp @@ -46,7 +46,6 @@ KBShortcutsDialog::KBShortcutsDialog() main_grid_sizer->Add(r_sizer, 0); m_head_bitmaps.reserve(m_full_shortcuts.size()); - const wxSize topic_size = wxSize(10 * wxGetApp().em_unit(), -1); for (auto& shortcut : m_full_shortcuts) { @@ -59,7 +58,7 @@ KBShortcutsDialog::KBShortcutsDialog() hsizer->Add(m_head_bitmaps.back(), 0, wxEXPAND | wxLEFT | wxRIGHT, 15); // 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); hsizer->Add(head, 0, wxALIGN_CENTER_VERTICAL); diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index b3765618b..2ac6b00af 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -524,8 +524,7 @@ void ConfigOptionsGroup::msw_rescale() { auto label = dynamic_cast(label_item->GetWindow()); if (label != nullptr) { - const int label_height = int(1.5f*label->GetFont().GetPixelSize().y + 0.5f); - label->SetMinSize(wxSize(label_width*em, /*-1*/label_height)); + label->SetMinSize(wxSize(label_width*em, -1)); } } else if (label_item->IsSizer()) // case when we have near_label_widget @@ -535,8 +534,7 @@ void ConfigOptionsGroup::msw_rescale() { auto label = dynamic_cast(l_item->GetWindow()); if (label != nullptr) { - const int label_height = int(1.5f*label->GetFont().GetPixelSize().y + 0.5f); - label->SetMinSize(wxSize(label_width*em, /*-1*/label_height)); + label->SetMinSize(wxSize(label_width*em, -1)); } } }