From fa4462514bb3b5a9e79e6819d007112169c6e787 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Tue, 10 Apr 2018 10:31:58 +0200
Subject: [PATCH] Added preset grouping to PresetCollection::update_tab_ui

---
 xs/src/slic3r/GUI/2DBed.hpp  |  6 ++++--
 xs/src/slic3r/GUI/Preset.cpp | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/xs/src/slic3r/GUI/2DBed.hpp b/xs/src/slic3r/GUI/2DBed.hpp
index 859417efb0..a170b708ad 100644
--- a/xs/src/slic3r/GUI/2DBed.hpp
+++ b/xs/src/slic3r/GUI/2DBed.hpp
@@ -6,7 +6,7 @@ namespace GUI {
 
 class Bed_2D : public wxPanel
 {
-	bool		m_user_drawn_background = false;
+	bool		m_user_drawn_background = true;
 
 	bool		m_painted = false;
 	bool		m_interactive = false;
@@ -26,7 +26,9 @@ public:
 	{
 		Create(parent, wxID_ANY, wxDefaultPosition, wxSize(250, -1), wxTAB_TRAVERSAL);
 //		m_user_drawn_background = $^O ne 'darwin';
-		m_user_drawn_background = true;
+#ifdef __APPLE__
+		m_user_drawn_background = false;
+#endif /*__APPLE__*/
 		Bind(wxEVT_PAINT, ([this](wxPaintEvent e) { repaint(); }));
 //		EVT_ERASE_BACKGROUND($self, sub{}) if $self->{user_drawn_background};
 //		Bind(EVT_MOUSE_EVENTS, ([this](wxMouseEvent  event){/*mouse_event()*/; }));
diff --git a/xs/src/slic3r/GUI/Preset.cpp b/xs/src/slic3r/GUI/Preset.cpp
index 845f11c961..bc34e193a9 100644
--- a/xs/src/slic3r/GUI/Preset.cpp
+++ b/xs/src/slic3r/GUI/Preset.cpp
@@ -531,16 +531,44 @@ void PresetCollection::update_tab_ui(wxBitmapComboBox *ui, bool show_incompatibl
         return;
     ui->Freeze();
     ui->Clear();
+	std::map<wxString, bool> nonsys_presets;
+	wxString selected = "";
     for (size_t i = this->m_presets.front().is_visible ? 0 : 1; i < this->m_presets.size(); ++ i) {
         const Preset &preset = this->m_presets[i];
         if (! preset.is_visible || (! show_incompatible && ! preset.is_compatible && i != m_idx_selected))
             continue;
         const wxBitmap *bmp = preset.is_compatible ? m_bitmap_compatible : m_bitmap_incompatible;
-        ui->Append(wxString::FromUTF8((preset.name + (preset.is_dirty ? g_suffix_modified : "")).c_str()),
-            (bmp == 0) ? (m_bitmap_main_frame ? *m_bitmap_main_frame : wxNullBitmap) : *bmp);
-		if (i == m_idx_selected)
-            ui->SetSelection(ui->GetCount() - 1);
+//         ui->Append(wxString::FromUTF8((preset.name + (preset.is_dirty ? g_suffix_modified : "")).c_str()),
+//             (bmp == 0) ? (m_bitmap_main_frame ? *m_bitmap_main_frame : wxNullBitmap) : *bmp);
+// 		if (i == m_idx_selected)
+//             ui->SetSelection(ui->GetCount() - 1);
+
+		if (preset.is_default || preset.is_system){
+			ui->Append(wxString::FromUTF8((preset.name + (preset.is_dirty ? g_suffix_modified : "")).c_str()),
+				(bmp == 0) ? (m_bitmap_main_frame ? *m_bitmap_main_frame : wxNullBitmap) : *bmp);
+			if (i == m_idx_selected)
+				ui->SetSelection(ui->GetCount() - 1);
+		}
+		else
+		{
+			nonsys_presets.emplace(wxString::FromUTF8((preset.name + (preset.is_dirty ? g_suffix_modified : "")).c_str()), preset.is_compatible);
+			if (i == m_idx_selected)
+				selected = wxString::FromUTF8((preset.name + (preset.is_dirty ? g_suffix_modified : "")).c_str());
+		}
+		if (preset.is_default)
+			ui->Append("______________________", wxNullBitmap);
     }
+	if (!nonsys_presets.empty())
+	{
+		ui->Append("______________________", wxNullBitmap);
+		for (std::map<wxString, bool>::iterator it = nonsys_presets.begin(); it != nonsys_presets.end(); ++it) {
+			const wxBitmap *bmp = it->second ? m_bitmap_compatible : m_bitmap_incompatible;
+			ui->Append(it->first,
+				(bmp == 0) ? (m_bitmap_main_frame ? *m_bitmap_main_frame : wxNullBitmap) : *bmp);
+			if (it->first == selected)
+				ui->SetSelection(ui->GetCount() - 1);
+		}
+	}
     ui->Thaw();
 }