diff --git a/resources/icons/redo_toolbar.svg b/resources/icons/redo_toolbar.svg
index 2853d4eaa..d2aca2cc7 100644
--- a/resources/icons/redo_toolbar.svg
+++ b/resources/icons/redo_toolbar.svg
@@ -2,12 +2,16 @@
diff --git a/resources/icons/search_.svg b/resources/icons/search_.svg
index 679bb30f7..2985ceb56 100644
--- a/resources/icons/search_.svg
+++ b/resources/icons/search_.svg
@@ -1,4 +1,26 @@
-
\ No newline at end of file
+
+
+
diff --git a/resources/icons/search_blink.svg b/resources/icons/search_blink.svg
new file mode 100644
index 000000000..d005f8373
--- /dev/null
+++ b/resources/icons/search_blink.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/resources/icons/settings.svg b/resources/icons/settings.svg
new file mode 100644
index 000000000..db5bf458d
--- /dev/null
+++ b/resources/icons/settings.svg
@@ -0,0 +1,68 @@
+
+
+
diff --git a/resources/icons/undo_toolbar.svg b/resources/icons/undo_toolbar.svg
index c9e277b5f..2fc25bf73 100644
--- a/resources/icons/undo_toolbar.svg
+++ b/resources/icons/undo_toolbar.svg
@@ -2,12 +2,16 @@
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 00034087c..e0c8c4c5b 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -4999,7 +4999,7 @@ bool GLCanvas3D::_init_main_toolbar()
return false;
item.name = "settings";
- item.icon_filename = "cog_.svg";
+ item.icon_filename = "settings.svg";
item.tooltip = _u8L("Switch to Settings") + "\n" + "[" + GUI::shortkey_ctrl_prefix() + "2] - " + _u8L("Print Settings Tab") +
"\n" + "[" + GUI::shortkey_ctrl_prefix() + "3] - " + (m_process->current_printer_technology() == ptFFF ? _u8L("Filament Settings Tab") : _u8L("Material Settings Tab")) +
"\n" + "[" + GUI::shortkey_ctrl_prefix() + "4] - " + _u8L("Printer Settings Tab") ;
@@ -5011,35 +5011,16 @@ bool GLCanvas3D::_init_main_toolbar()
if (!m_main_toolbar.add_item(item))
return false;
+ /*
if (!m_main_toolbar.add_separator())
return false;
-
- item.name = "layersediting";
- item.icon_filename = "layers_white.svg";
- item.tooltip = _utf8(L("Variable layer height"));
- item.sprite_id = 11;
- item.left.toggable = true;
- item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING)); };
- item.visibility_callback = [this]()->bool
- {
- bool res = m_process->current_printer_technology() == ptFFF;
- // turns off if changing printer technology
- if (!res && m_main_toolbar.is_item_visible("layersediting") && m_main_toolbar.is_item_pressed("layersediting"))
- force_main_toolbar_left_action(get_main_toolbar_item_id("layersediting"));
-
- return res;
- };
- item.enabling_callback = []()->bool { return wxGetApp().plater()->can_layers_editing(); };
- if (!m_main_toolbar.add_item(item))
- return false;
-
- if (!m_main_toolbar.add_separator())
- return false;
+ */
item.name = "search";
item.icon_filename = "search_.svg";
item.tooltip = _utf8(L("Search")) + " [" + GUI::shortkey_ctrl_prefix() + "F]";
- item.sprite_id = 12;
+ item.sprite_id = 11;
+ item.left.toggable = true;
item.left.render_callback = [this](float left, float right, float, float) {
if (m_canvas != nullptr)
{
@@ -5053,6 +5034,27 @@ bool GLCanvas3D::_init_main_toolbar()
if (!m_main_toolbar.add_item(item))
return false;
+ if (!m_main_toolbar.add_separator())
+ return false;
+
+ item.name = "layersediting";
+ item.icon_filename = "layers_white.svg";
+ item.tooltip = _utf8(L("Variable layer height"));
+ item.sprite_id = 12;
+ item.left.action_callback = [this]() { if (m_canvas != nullptr) wxPostEvent(m_canvas, SimpleEvent(EVT_GLTOOLBAR_LAYERSEDITING)); };
+ item.visibility_callback = [this]()->bool {
+ bool res = m_process->current_printer_technology() == ptFFF;
+ // turns off if changing printer technology
+ if (!res && m_main_toolbar.is_item_visible("layersediting") && m_main_toolbar.is_item_pressed("layersediting"))
+ force_main_toolbar_left_action(get_main_toolbar_item_id("layersediting"));
+
+ return res;
+ };
+ item.enabling_callback = []()->bool { return wxGetApp().plater()->can_layers_editing(); };
+ item.left.render_callback = GLToolbarItem::Default_Render_Callback;
+ if (!m_main_toolbar.add_item(item))
+ return false;
+
return true;
}
@@ -5161,10 +5163,10 @@ bool GLCanvas3D::_init_undoredo_toolbar()
if (!m_undoredo_toolbar.add_item(item))
return false;
-
+ /*
if (!m_undoredo_toolbar.add_separator())
return false;
-
+ */
return true;
}
@@ -5553,6 +5555,10 @@ void GLCanvas3D::_render_selection_center() const
void GLCanvas3D::_check_and_update_toolbar_icon_scale() const
{
+ // Don't update a toolbar scale, when we are on a Preview
+ if (wxGetApp().plater()->is_preview_shown())
+ return;
+
float scale = wxGetApp().toolbar_icon_scale();
Size cnv_size = get_canvas_size();
diff --git a/src/slic3r/GUI/wxExtensions.hpp b/src/slic3r/GUI/wxExtensions.hpp
index e20e5c8bd..4f04bc5b2 100644
--- a/src/slic3r/GUI/wxExtensions.hpp
+++ b/src/slic3r/GUI/wxExtensions.hpp
@@ -338,7 +338,7 @@ class BlinkingBitmap : public wxStaticBitmap
{
public:
BlinkingBitmap() {};
- BlinkingBitmap(wxWindow* parent, const std::string& icon_name = "redo_toolbar");
+ BlinkingBitmap(wxWindow* parent, const std::string& icon_name = "search_blink");
~BlinkingBitmap() {}