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

Bugfix Set single source as current after area selection

Browse Source 
Strict conditions to set a source as current after an area selection
This commit is contained in:
Bruno Herbelin
2023-06-25 18:23:46 +02:00
parent 82046afd9f
commit 26da3bf9a8
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/UserInterfaceManager.cpp
View File

@@ -671,15 +671,15 @@ void UserInterface::handleMouse()
if ( ImGui::IsMouseReleased(ImGuiMouseButton_Left) || ImGui::IsMouseReleased(ImGuiMouseButton_Right) ) if ( ImGui::IsMouseReleased(ImGuiMouseButton_Left) || ImGui::IsMouseReleased(ImGuiMouseButton_Right) )
{ {
// special case of one single source in area selection : make current after release
if (view_drag && picked.first == nullptr && Mixer::selection().size() == 1)
Mixer::manager().setCurrentSource( Mixer::selection().front() );
view_drag = nullptr; view_drag = nullptr;
mousedown = false; mousedown = false;
picked = { nullptr, glm::vec2(0.f) }; picked = { nullptr, glm::vec2(0.f) };
Mixer::manager().view()->terminate(); Mixer::manager().view()->terminate();
SetMouseCursor(io.MousePos); SetMouseCursor(io.MousePos);
// special case of one single source in selection : make current after release
if (Mixer::selection().size() == 1)
Mixer::manager().setCurrentSource( Mixer::selection().front() );
} }
} }
@@ -7386,16 +7386,14 @@ void Navigator::Render()
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImGui::GetColorU32(ImGuiCol_ButtonHovered)); ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImGui::GetColorU32(ImGuiCol_ButtonHovered));
} }
// draw an indicator for current source // draw an indicator for selected sources (a dot) and for the current source (a line)
if ( s->mode() >= Source::SELECTED ){ if (s->mode() > Source::VISIBLE) {
ImVec2 p1 = ImGui::GetCursorScreenPos() + ImVec2(icon_width, 0.5f * sourceiconsize.y); // source is SELECTED or CURRENT
ImVec2 p2 = ImVec2(p1.x + 2.f, p1.y + 2.f); const ImVec2 p1 = ImGui::GetCursorScreenPos() +
ImVec2(icon_width, (s->mode() > Source::SELECTED ? 0.f : 0.5f * sourceiconsize.y - 2.5f) );
const ImVec2 p2 = ImVec2(p1.x, p1.y + (s->mode() > Source::SELECTED ? sourceiconsize.y : 5.f) );
const ImU32 color = ImGui::GetColorU32(ImGuiCol_Text); const ImU32 color = ImGui::GetColorU32(ImGuiCol_Text);
if ((*iter)->mode() == Source::CURRENT) { draw_list->AddLine(p1, p2, color, 5.f);
p1 = ImGui::GetCursorScreenPos() + ImVec2(icon_width, 0);
p2 = ImVec2(p1.x + 2.f, p1.y + sourceiconsize.y);
}
draw_list->AddRect(p1, p2, color, 0.0f, 0, 3.f);
} }
// draw select box // draw select box
ImGui::PushID(std::to_string(s->group(View::RENDERING)->id()).c_str()); ImGui::PushID(std::to_string(s->group(View::RENDERING)->id()).c_str());