From 99ccfb8e94ae6e7df1952332ed24c4b7ffe79807 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Wed, 19 Apr 2023 22:54:58 +0200 Subject: [PATCH] Revert back: disable clic on source initials in mixing and layers view There is a bug in testing of bounding box and the interaction is not clear. --- src/LayerView.cpp | 9 --------- src/MixingView.cpp | 9 --------- 2 files changed, 18 deletions(-) diff --git a/src/LayerView.cpp b/src/LayerView.cpp index e630465..eed8587 100644 --- a/src/LayerView.cpp +++ b/src/LayerView.cpp @@ -257,10 +257,6 @@ std::pair LayerView::pick(glm::vec2 P) else if ( pick.first == s->symbol_ ) { 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 pick = { nullptr, glm::vec2(0.f) }; @@ -360,11 +356,6 @@ View::Cursor LayerView::over (glm::vec2 pos) // overlay symbol if ( pick.first == s->symbol_ ) 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; diff --git a/src/MixingView.cpp b/src/MixingView.cpp index 13e07b9..7ecc8f8 100644 --- a/src/MixingView.cpp +++ b/src/MixingView.cpp @@ -448,10 +448,6 @@ std::pair MixingView::pick(glm::vec2 P) else if ( pick.first == s->symbol_ ) { 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 else if ( pick.first == s->rotation_mixingroup_ ) { if (UserInterface::manager().shiftModifier()) @@ -667,11 +663,6 @@ View::Cursor MixingView::over (glm::vec2 pos) // overlay symbol if ( pick.first == s->symbol_ ) 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;