apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

wind: Reorder drag sequence
All checks were successful
continuous-integration/drone/pr Build is passing
Details

Browse Source
This commit is contained in:
apio 2023-08-04 13:08:48 +02:00
parent 25cbaf4f90
commit 653b2074c0
Signed by: apio
GPG Key ID: B8A7D06E42258954
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wind/Mouse.cpp
View File

@ -20,21 +20,7 @@ void Mouse::update(const moon::MousePacket& packet)
m_position.y -= packet.ydelta; m_position.y -= packet.ydelta;
m_position = m_screen_rect.normalize(m_position); m_position = m_screen_rect.normalize(m_position);
if ((packet.buttons & moon::MouseButton::Left) && !m_dragging_window) if (m_dragging_window && !(packet.buttons & moon::MouseButton::Left))
{
g_windows.for_each_reversed([this](Window* window) {
if (!this->m_dragging_window && window->surface.contains(this->m_position))
{
this->m_dragging_window = window;
this->m_initial_drag_position = ui::Point { this->m_position.x - window->surface.pos.x,
this->m_position.y - window->surface.pos.y };
os::println("Started drag: window at (%d,%d,%d,%d) with offset (%d,%d)", window->surface.pos.x,
window->surface.pos.y, window->surface.width, window->surface.height,
this->m_initial_drag_position.x, this->m_initial_drag_position.y);
}
});
}
else if (m_dragging_window && !(packet.buttons & moon::MouseButton::Left))
{ {
os::println("Stopped drag: window at (%d,%d,%d,%d) with offset (%d,%d)", m_dragging_window->surface.pos.x, os::println("Stopped drag: window at (%d,%d,%d,%d) with offset (%d,%d)", m_dragging_window->surface.pos.x,
m_dragging_window->surface.pos.y, m_dragging_window->surface.width, m_dragging_window->surface.pos.y, m_dragging_window->surface.width,
@ -48,6 +34,21 @@ void Mouse::update(const moon::MousePacket& packet)
m_dragging_window->surface.pos = m_dragging_window->surface.pos =
ui::Point { m_position.x - m_initial_drag_position.x, m_position.y - m_initial_drag_position.y }; ui::Point { m_position.x - m_initial_drag_position.x, m_position.y - m_initial_drag_position.y };
m_dragging_window->surface = m_dragging_window->surface.absolute(); m_dragging_window->surface = m_dragging_window->surface.absolute();
m_dragging_window->focus(); }
else if ((packet.buttons & moon::MouseButton::Left) && !m_dragging_window)
{
g_windows.for_each_reversed([this](Window* window) {
if (!this->m_dragging_window && window->surface.contains(this->m_position))
{
this->m_dragging_window = window;
this->m_initial_drag_position = ui::Point { this->m_position.x - window->surface.pos.x,
this->m_position.y - window->surface.pos.y };
os::println("Started drag: window at (%d,%d,%d,%d) with offset (%d,%d)", window->surface.pos.x,
window->surface.pos.y, window->surface.width, window->surface.height,
this->m_initial_drag_position.x, this->m_initial_drag_position.y);
window->focus();
}
});
} }
} }