From a30a2547243c28dccb88de8776c8d3f26f427245 Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Mon, 19 Sep 2022 11:14:29 +0200
Subject: [PATCH] After merge fix

---
 src/slic3r/GUI/ImGuiWrapper.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index 9622da145..e9e5137be 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -56,6 +56,10 @@ static const std::map<const wchar_t, std::string> font_icons = {
     {ImGui::PreferencesHoverButton, "notification_preferences_hover"},
     {ImGui::SliderFloatEditBtnIcon, "edit_button"                   },
     {ImGui::SliderFloatEditBtnPressedIcon, "edit_button_pressed"    },
+    {ImGui::ExpandBtn             , "expand_btn"                    },
+    {ImGui::CollapseBtn           , "collapse_btn"                  },
+    {ImGui::RevertButton          , "undo"                          },
+    {ImGui::WarningMarkerSmall    , "notification_warning"          },
 };
 
 static const std::map<const wchar_t, std::string> font_icons_large = {
@@ -73,10 +77,6 @@ static const std::map<const wchar_t, std::string> font_icons_large = {
     {ImGui::LegendShells          , "legend_shells"                 },
     {ImGui::LegendToolMarker      , "legend_toolmarker"             },
 #endif // ENABLE_LEGEND_TOOLBAR_ICONS
-    {ImGui::RevertButton          , "undo"                          },
-    {ImGui::WarningMarkerSmall    , "notification_warning"          },
-    {ImGui::ExpandBtn             , "expand_btn"                    },
-    {ImGui::CollapseBtn           , "collapse_btn"                  },
     {ImGui::CloseNotifButton        , "notification_close"              },
     {ImGui::CloseNotifHoverButton   , "notification_close_hover"        },
     {ImGui::EjectButton             , "notification_eject_sd"           },