Skip to content

Commit c47d1b4

Browse files
committed
Move toolbar visibility code to select_last_(tile|object)group
[ci skip]
1 parent 88aafd0 commit c47d1b4

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/editor/editor.cpp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,24 +1427,10 @@ Editor::toggle_tile_object_mode()
14271427
if (input_type == InputType::OBJECT)
14281428
{
14291429
select_last_tilegroup();
1430-
for(const auto& widget : m_widgets)
1431-
{
1432-
if (auto toolbar_button = dynamic_cast<EditorToolbarButtonWidget*>(widget.get()))
1433-
{
1434-
toolbar_button->set_visible(toolbar_button->get_visible_in_tile_mode());
1435-
}
1436-
}
14371430
}
14381431
else
14391432
{
14401433
select_last_objectgroup();
1441-
for(const auto& widget : m_widgets)
1442-
{
1443-
if (auto toolbar_button = dynamic_cast<EditorToolbarButtonWidget*>(widget.get()))
1444-
{
1445-
toolbar_button->set_visible(toolbar_button->get_visible_in_object_mode());
1446-
}
1447-
}
14481434
}
14491435

14501436
for (const auto& widget : m_widgets)
@@ -1488,6 +1474,14 @@ void
14881474
Editor::select_last_tilegroup()
14891475
{
14901476
m_toolbox_widget->select_last_tilegroup();
1477+
1478+
for(const auto& widget : m_widgets)
1479+
{
1480+
if (auto toolbar_button = dynamic_cast<EditorToolbarButtonWidget*>(widget.get()))
1481+
{
1482+
toolbar_button->set_visible(toolbar_button->get_visible_in_tile_mode());
1483+
}
1484+
}
14911485
}
14921486

14931487
const std::vector<Tilegroup>&
@@ -1518,6 +1512,14 @@ void
15181512
Editor::select_last_objectgroup()
15191513
{
15201514
m_toolbox_widget->select_last_objectgroup();
1515+
1516+
for(const auto& widget : m_widgets)
1517+
{
1518+
if (auto toolbar_button = dynamic_cast<EditorToolbarButtonWidget*>(widget.get()))
1519+
{
1520+
toolbar_button->set_visible(toolbar_button->get_visible_in_object_mode());
1521+
}
1522+
}
15211523
}
15221524

15231525
const std::vector<ObjectGroup>&

0 commit comments

Comments
 (0)