eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-11 18:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Selection pick bug fix

Browse Source
This commit is contained in:
brunoherbelin
2021-03-15 23:25:54 +01:00
parent ce38bf72b8
commit 9a5983d6de
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
GeometryView.cpp
View File

@@ -449,17 +449,29 @@ std::pair<Node *, glm::vec2> GeometryView::pick(glm::vec2 P)
// accept picked sources in current workspaces // accept picked sources in current workspaces
if ( s!=nullptr && s->workspace() == Settings::application.current_workspace) { if ( s!=nullptr && s->workspace() == Settings::application.current_workspace) {
// lock icon of a source is picked : unlock // lock icon of a source (not current) is picked : unlock
if ( (*itp).first == s->lock_) { if ( (*itp).first == s->lock_) {
s->setLocked(false); s->setLocked(false);
pick = { s->locker_, (*itp).second }; pick = { s->locker_, (*itp).second };
break; break;
} }
// a non-locked source is picked (or locked with CTRL key) // a non-locked source is picked (anywhere)
else if ( !s->locked() || ( s->locked() && UserInterface::manager().ctrlModifier() ) ) { else if ( !s->locked() ) {
// not in an active selection? don't pick this one!
if ( !UserInterface::manager().ctrlModifier() &&
Mixer::selection().size() > 1 &&
!Mixer::selection().contains(s))
continue;
// yeah, pick this one (NB: locker_ is just a node in Geometry that is detected)
pick = { s->locker_, (*itp).second }; pick = { s->locker_, (*itp).second };
break; break;
} }
// force pick a locked source with CTRL key
else if ( s->locked() && UserInterface::manager().ctrlModifier() ) {
pick = { s->locker_, (*itp).second };
break;
}
} }
// no source picked // no source picked
else { else {