3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 05:37:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

New concept of the main IU.

Browse source 
* only 2 mode - Regular & Expert
* "Export Gcode" moved to bottom of the window (analogue to the PrusaControll)
* Experiments with layout of collapsible_pane [! not successful]
This commit is contained in:
YuSanka 2018-05-27 22:12:01 +02:00
parent 46f71661b2
commit d93a8aec3d
7 changed files with 131 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xs/src/slic3r/GUI/wxExtensions.hpp
View file

@ -8,6 +8,7 @@
#include <wx/collpane.h>
#include <wx/wupdlock.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <vector>
#include <set>
@ -83,6 +84,7 @@ class PrusaCollapsiblePane : public wxCollapsiblePane
wxBitmap m_bmp_close;
wxBitmap m_bmp_open;
#endif //__WXMSW__
wxWindow* m_top_parent = nullptr;
public:
PrusaCollapsiblePane() {}
PrusaCollapsiblePane( wxWindow *parent,
@ -102,14 +104,32 @@ public:
this->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, ([parent, this](wxCommandEvent e){
wxWindowUpdateLocker noUpdates_cp(this);
wxWindowUpdateLocker noUpdates(parent);
parent->GetParent() ? parent->GetParent()->Layout() : //;
parent->Layout();
// this->Refresh();
parent->Layout();
this->Refresh();
if (m_top_parent)
{
m_top_parent->GetSizer()->Layout();
}
else{
wxGetTopLevelParent(this)->Layout();
}
// if (parent->GetParent()){
// parent->GetParent()->Layout();
// parent->Refresh();
// }
// else{
// parent->Layout();
// this->Refresh();}
}));
}
~PrusaCollapsiblePane() {}
void SetTopParent(wxWindow *parent) { m_top_parent = parent; }
#ifdef __WXMSW__
bool Create(wxWindow *parent,
wxWindowID id,