juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Collapse toolbar moved from GLCanvas3D to Plater::priv

Browse Source
This commit is contained in:
enricoturri1966
2020-06-05 12:33:09 +02:00
parent 1e3290fee1
commit 4f63095d9a
6 changed files with 96 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/GLToolbar.cpp
View File

@@ -1238,7 +1238,7 @@ bool GLToolbar::generate_icons_texture() const
}
std::vector<std::pair<int, bool>> states;
if (m_name == "Top")
if (m_type == Normal)
{
states.push_back({ 1, false }); // Normal
states.push_back({ 0, false }); // Pressed
@@ -1247,7 +1247,7 @@ bool GLToolbar::generate_icons_texture() const
states.push_back({ 0, false }); // HoverPressed
states.push_back({ 2, false }); // HoverDisabled
}
else if (m_name == "View")
else
{
states.push_back({ 1, false }); // Normal
states.push_back({ 1, true }); // Pressed