natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalize multiselect UX

Browse Source
This commit is contained in:
Skarn
2020-10-16 22:03:28 +03:00
parent d0eecdf2c9
commit c92fde6759
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/noggit/MapView.cpp
View File

@@ -2251,7 +2251,7 @@ void MapView::doSelection (bool selectTerrainOnly, bool mouseMove)
if (terrainMode == editing_mode::object) if (terrainMode == editing_mode::object)
{ {
if (QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ShiftModifier)) if (_mod_shift_down)
{ {
if (hit.which() == eEntry_Model || hit.which() == eEntry_WMO) if (hit.which() == eEntry_Model || hit.which() == eEntry_WMO)
{ {
@@ -2268,9 +2268,8 @@ void MapView::doSelection (bool selectTerrainOnly, bool mouseMove)
{ {
_world->range_add_to_selection(_cursor_pos, objectEditor->brushRadius(), false); _world->range_add_to_selection(_cursor_pos, objectEditor->brushRadius(), false);
} }
} }
else if (QGuiApplication::queryKeyboardModifiers().testFlag(Qt::ControlModifier)) else if (_mod_ctrl_down)
{ {
if (hit.which() == eEntry_MapChunk) if (hit.which() == eEntry_MapChunk)
{ {
@@ -2283,7 +2282,7 @@ void MapView::doSelection (bool selectTerrainOnly, bool mouseMove)
_world->add_to_selection(hit); _world->add_to_selection(hit);
} }
} }
else if (hit.which() == eEntry_MapChunk) else if (hit.which() == eEntry_MapChunk && !mouseMove)
{ {
_world->reset_selection(); _world->reset_selection();
_world->add_to_selection(hit); _world->add_to_selection(hit);