yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix mouseChanged signal arguments in InputRedirectionCursor

Browse source 
The button state was not represented correctly which was very visible
when using the MouseClickEffect. Now MouseClickEffect on Wayland works
as expected.
This commit is contained in:
Martin Gräßlin 2015-10-28 09:18:26 +01:00
parent 129636de2e
commit 7dcd69fdcc
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cursor.cpp
View file

@ -511,7 +511,6 @@ QByteArray Cursor::cursorName(Qt::CursorShape shape) const
InputRedirectionCursor::InputRedirectionCursor(QObject *parent)
: Cursor(parent)
, m_oldButtons(Qt::NoButton)
, m_currentButtons(Qt::NoButton)
{
connect(input(), SIGNAL(globalPointerChanged(QPointF)), SLOT(slotPosChanged(QPointF)));
@ -547,7 +546,7 @@ void InputRedirectionCursor::slotPosChanged(const QPointF &pos)
{
const QPoint oldPos = currentPos();
updatePos(pos.toPoint());
emit mouseChanged(pos.toPoint(), oldPos, m_currentButtons, m_oldButtons,
emit mouseChanged(pos.toPoint(), oldPos, m_currentButtons, m_currentButtons,
input()->keyboardModifiers(), input()->keyboardModifiers());
}
@ -558,8 +557,10 @@ void InputRedirectionCursor::slotModifiersChanged(Qt::KeyboardModifiers mods, Qt
void InputRedirectionCursor::slotPointerButtonChanged()
{
m_oldButtons = m_currentButtons;
const Qt::MouseButtons oldButtons = m_currentButtons;
m_currentButtons = input()->qtButtonStates();
const QPoint pos = currentPos();
emit mouseChanged(pos, pos, m_currentButtons, oldButtons, input()->keyboardModifiers(), input()->keyboardModifiers());
}
void InputRedirectionCursor::doStartCursorTracking()

1
cursor.h
View file

@ -271,7 +271,6 @@ private Q_SLOTS:
void slotModifiersChanged(Qt::KeyboardModifiers mods, Qt::KeyboardModifiers oldMods);
private:
explicit InputRedirectionCursor(QObject *parent);
Qt::MouseButtons m_oldButtons;
Qt::MouseButtons m_currentButtons;
friend class Cursor;
};