3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Addition to last commit

Browse source
This commit is contained in:
YuSanka 2018-06-28 16:50:06 +02:00
parent 0b1833a2af
commit 75bda8cfd8
2 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
xs/src/slic3r/GUI/Tab.cpp
View file

@ -45,6 +45,8 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle)
main_sizer->SetSizeHints(this); main_sizer->SetSizeHints(this);
this->SetSizer(main_sizer); this->SetSizer(main_sizer);
// Create additional panel to Fit() it from OnActivate()
// It's needed for tooltip showing on OSX
m_tmp_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL); m_tmp_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL);
auto panel = m_tmp_panel; auto panel = m_tmp_panel;
auto sizer = new wxBoxSizer(wxVERTICAL); auto sizer = new wxBoxSizer(wxVERTICAL);
@ -293,7 +295,12 @@ PageShp Tab::add_options_page(const wxString& title, const std::string& icon, bo
} }
} }
// Initialize the page. // Initialize the page.
PageShp page(new Page(this, title, icon_idx)); #ifdef __WXOSX__
auto panel = m_tmp_panel;
#else
auto panel = this;
#endif
PageShp page(new Page(panel, title, icon_idx));
page->SetScrollbars(1, 1, 1, 1); page->SetScrollbars(1, 1, 1, 1);
page->Hide(); page->Hide();
m_hsizer->Add(page.get(), 1, wxEXPAND | wxLEFT, 5); m_hsizer->Add(page.get(), 1, wxEXPAND | wxLEFT, 5);
@ -309,20 +316,22 @@ void Tab::OnActivate()
#ifdef __WXOSX__ #ifdef __WXOSX__
wxWindowUpdateLocker noUpdates(this); wxWindowUpdateLocker noUpdates(this);
auto sizer = GetSizer();
m_tmp_panel->GetSizer()->SetMinSize(sizer->GetSize());
m_tmp_panel->Fit(); m_tmp_panel->Fit();
Page* page = nullptr; // Page* page = nullptr;
auto selection = m_treectrl->GetItemText(m_treectrl->GetSelection()); // auto selection = m_treectrl->GetItemText(m_treectrl->GetSelection());
for (auto p : m_pages) // for (auto p : m_pages)
if (p->title() == selection) // if (p->title() == selection)
{ // {
page = p.get(); // page = p.get();
break; // break;
} // }
if (page == nullptr) return; // if (page == nullptr) return;
page->Fit(); // page->Fit();
m_hsizer->Layout(); // m_hsizer->Layout();
Refresh(); // Refresh();
#endif // __WXOSX__ #endif // __WXOSX__
} }
@ -2124,6 +2133,7 @@ void Tab::OnTreeSelChange(wxTreeEvent& event)
#endif #endif
page->Show(); page->Show();
page->Fit();
m_hsizer->Layout(); m_hsizer->Layout();
Refresh(); Refresh();

2
xs/src/slic3r/GUI/Tab.hpp
View file

@ -200,7 +200,7 @@ public:
Tab() {} Tab() {}
Tab(wxNotebook* parent, const wxString& title, const char* name, bool no_controller) : Tab(wxNotebook* parent, const wxString& title, const char* name, bool no_controller) :
m_parent(parent), m_title(title), m_name(name), m_no_controller(no_controller) { m_parent(parent), m_title(title), m_name(name), m_no_controller(no_controller) {
Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL); Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBK_LEFT | wxTAB_TRAVERSAL, name);
get_tabs_list().push_back(this); get_tabs_list().push_back(this);
} }
~Tab(){ ~Tab(){