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 cursor feedback display

Browse Source
This commit is contained in:
brunoherbelin
2020-06-26 18:28:03 +02:00
parent 1282604705
commit 6e2c0cb338
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UserInterfaceManager.cpp
View File

@@ -293,7 +293,7 @@ void UserInterface::handleKeyboard()
} }
void setMouseCursor(glm::vec2 mousepos, View::Cursor c = View::Cursor()) void setMouseCursor(ImVec2 mousepos, View::Cursor c = View::Cursor())
{ {
ImGui::SetMouseCursor(c.type); ImGui::SetMouseCursor(c.type);
@@ -325,7 +325,7 @@ void UserInterface::handleMouse()
static std::pair<Node *, glm::vec2> picked = { nullptr, glm::vec2(0.f) }; static std::pair<Node *, glm::vec2> picked = { nullptr, glm::vec2(0.f) };
// steal focus on right button clic // steal focus on right button clic
if (!ImGui::GetIO().WantCaptureMouse) if (!io.WantCaptureMouse)
if (ImGui::IsMouseClicked(ImGuiMouseButton_Right) /*|| ImGui::IsMouseClicked(ImGuiMouseButton_Middle)*/) if (ImGui::IsMouseClicked(ImGuiMouseButton_Right) /*|| ImGui::IsMouseClicked(ImGuiMouseButton_Middle)*/)
ImGui::FocusWindow(NULL); ImGui::FocusWindow(NULL);
@@ -360,7 +360,7 @@ void UserInterface::handleMouse()
{ {
// right mouse drag => drag current view // right mouse drag => drag current view
View::Cursor c = Mixer::manager().view()->drag( mouseclic[ImGuiMouseButton_Right], mousepos); View::Cursor c = Mixer::manager().view()->drag( mouseclic[ImGuiMouseButton_Right], mousepos);
setMouseCursor(mousepos, c); setMouseCursor(io.MousePos, c);
} }
else if ( ImGui::IsMouseDown(ImGuiMouseButton_Right)) { else if ( ImGui::IsMouseDown(ImGuiMouseButton_Right)) {
@@ -449,7 +449,7 @@ void UserInterface::handleMouse()
View::Cursor c = View::Cursor_Arrow; View::Cursor c = View::Cursor_Arrow;
for (auto it = Mixer::selection().begin(); it != Mixer::selection().end(); it++) for (auto it = Mixer::selection().begin(); it != Mixer::selection().end(); it++)
c = Mixer::manager().view()->grab(*it, mouseclic[ImGuiMouseButton_Left], mousepos, picked); c = Mixer::manager().view()->grab(*it, mouseclic[ImGuiMouseButton_Left], mousepos, picked);
setMouseCursor(mousepos, c); setMouseCursor(io.MousePos, c);
} }
else { else {
// Selection area // Selection area