ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11732 from malleoz/malleo/limit_stick_emits 

DolphinQt: StickWidget and IRWidget check for changed x/y before signaling change
This commit is contained in:
Admiral H. Curtiss 2023-04-07 00:42:49 +02:00 committed by GitHub
parent 0a88c2329a cd79207853
commit d32e47cfde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinQt/TAS/IRWidget.cpp
View File

@ -79,6 +79,9 @@ void IRWidget::mouseMoveEvent(QMouseEvent* event)
void IRWidget::handleMouseEvent(QMouseEvent* event) void IRWidget::handleMouseEvent(QMouseEvent* event)
{ {
u16 prev_x = m_x;
u16 prev_y = m_y;
if (event->button() == Qt::RightButton) if (event->button() == Qt::RightButton)
{ {
m_x = std::round(ir_max_x / 2.); m_x = std::round(ir_max_x / 2.);
@ -94,7 +97,18 @@ void IRWidget::handleMouseEvent(QMouseEvent* event)
m_y = std::max(0, std::min(static_cast<int>(ir_max_y), new_y)); m_y = std::max(0, std::min(static_cast<int>(ir_max_y), new_y));
} }
bool changed = false;
if (prev_x != m_x)
{
emit ChangedX(m_x); emit ChangedX(m_x);
changed = true;
}
if (prev_y != m_y)
{
emit ChangedY(m_y); emit ChangedY(m_y);
changed = true;
}
if (changed)
update(); update();
} }

14
Source/Core/DolphinQt/TAS/StickWidget.cpp
View File

@ -82,6 +82,9 @@ void StickWidget::mouseMoveEvent(QMouseEvent* event)
void StickWidget::handleMouseEvent(QMouseEvent* event) void StickWidget::handleMouseEvent(QMouseEvent* event)
{ {
u16 prev_x = m_x;
u16 prev_y = m_y;
if (event->button() == Qt::RightButton) if (event->button() == Qt::RightButton)
{ {
m_x = std::round(m_max_x / 2.); m_x = std::round(m_max_x / 2.);
@ -97,7 +100,18 @@ void StickWidget::handleMouseEvent(QMouseEvent* event)
m_y = std::max(0, std::min(static_cast<int>(m_max_y), new_y)); m_y = std::max(0, std::min(static_cast<int>(m_max_y), new_y));
} }
bool changed = false;
if (prev_x != m_x)
{
emit ChangedX(m_x); emit ChangedX(m_x);
changed = true;
}
if (prev_y != m_y)
{
emit ChangedY(m_y); emit ChangedY(m_y);
changed = true;
}
if (changed)
update(); update();
} }