eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-20 06:39:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert back: disable clic on source initials in mixing and layers view

Browse Source 
There is a bug in testing of bounding box and the interaction is not clear.
This commit is contained in:
Bruno Herbelin
2023-04-19 22:54:58 +02:00
parent 4ed884de55
commit 99ccfb8e94
2 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/LayerView.cpp
View File

@@ -257,10 +257,6 @@ std::pair<Node *, glm::vec2> LayerView::pick(glm::vec2 P)
else if ( pick.first == s->symbol_ ) { else if ( pick.first == s->symbol_ ) {
UserInterface::manager().showSourceEditor(s); UserInterface::manager().showSourceEditor(s);
} }
// pick the initials: ask to show left panel
else if ( pick.first == s->initial_0_ || pick.first == s->initial_1_ ) {
UserInterface::manager().showSourcePanel(s);
}
} }
else else
pick = { nullptr, glm::vec2(0.f) }; pick = { nullptr, glm::vec2(0.f) };
@@ -360,11 +356,6 @@ View::Cursor LayerView::over (glm::vec2 pos)
// overlay symbol // overlay symbol
if ( pick.first == s->symbol_ ) if ( pick.first == s->symbol_ )
s->symbol_->color = glm::vec4( h.x, h.y, h.z, 1.f ); s->symbol_->color = glm::vec4( h.x, h.y, h.z, 1.f );
// overlay initials
if ( pick.first == s->initial_0_ || pick.first == s->initial_1_ ) {
s->initial_0_->color = glm::vec4( h.x, h.y, h.z, 1.f );
s->initial_1_->color = glm::vec4( h.x, h.y, h.z, 1.f );
}
} }
return ret; return ret;

9
src/MixingView.cpp
View File

@@ -448,10 +448,6 @@ std::pair<Node *, glm::vec2> MixingView::pick(glm::vec2 P)
else if ( pick.first == s->symbol_ ) { else if ( pick.first == s->symbol_ ) {
UserInterface::manager().showSourceEditor(s); UserInterface::manager().showSourceEditor(s);
} }
// pick the initials: ask to show left panel
else if ( pick.first == s->initial_0_ || pick.first == s->initial_1_ ) {
UserInterface::manager().showSourcePanel(s);
}
// pick on the mixing group rotation icon // pick on the mixing group rotation icon
else if ( pick.first == s->rotation_mixingroup_ ) { else if ( pick.first == s->rotation_mixingroup_ ) {
if (UserInterface::manager().shiftModifier()) if (UserInterface::manager().shiftModifier())
@@ -667,11 +663,6 @@ View::Cursor MixingView::over (glm::vec2 pos)
// overlay symbol // overlay symbol
if ( pick.first == s->symbol_ ) if ( pick.first == s->symbol_ )
s->symbol_->color = glm::vec4( h.x, h.y, h.z, 1.f ); s->symbol_->color = glm::vec4( h.x, h.y, h.z, 1.f );
// overlay initials
if ( pick.first == s->initial_0_ || pick.first == s->initial_1_ ) {
s->initial_0_->color = glm::vec4( h.x, h.y, h.z, 1.f );
s->initial_1_->color = glm::vec4( h.x, h.y, h.z, 1.f );
}
} }
return ret; return ret;