Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeui: prepare for Katie changes

Browse source 
note that button 4 and 5, which are mouse wheel buttons, are mapped to
wrong buttons in KModifierKeyInfoProvider constructor

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-02-18 21:40:31 +02:00
parent f59bdb8a01
commit 56e3b24d36
3 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kdeui/shortcuts/kgesture.cpp
View file

@ -445,12 +445,6 @@ KRockerGesture::KRockerGesture(const QString &description)
case 'M':
*current = Qt::MiddleButton;
break;
case '1':
*current = Qt::XButton1;
break;
case '2':
*current = Qt::XButton2;
break;
default:
return;
}
@ -487,8 +481,6 @@ void KRockerGesture::setButtons(Qt::MouseButton hold, Qt::MouseButton thenPush)
case Qt::LeftButton:
case Qt::RightButton:
case Qt::MiddleButton:
case Qt::XButton1:
case Qt::XButton2:
break;
default:
d->m_hold = Qt::NoButton;
@ -565,12 +557,6 @@ QString KRockerGesture::toString() const
case Qt::MiddleButton:
desc = 'M';
break;
case Qt::XButton1:
desc = '1';
break;
case Qt::XButton2:
desc = '2';
break;
default:
return QString();
}

2
kdeui/tests/kmodifierkeyinfotest.cpp
View file

@ -89,8 +89,6 @@ TestWidget::TestWidget() : QWidget(0), m_lock(this)
buttons.insert(Qt::LeftButton, "Left Button");
buttons.insert(Qt::RightButton, "Right Button");
buttons.insert(Qt::MiddleButton, "Middle Button");
buttons.insert(Qt::XButton1, "First X Button");
buttons.insert(Qt::XButton2, "Second X Button");
QVBoxLayout *layout = new QVBoxLayout(this);

2
kdeui/util/kmodifierkeyinfoprovider_x11.cpp
View file

@ -119,8 +119,6 @@ KModifierKeyInfoProvider::KModifierKeyInfoProvider()
m_xkbButtons.insert(Qt::LeftButton, Button1Mask);
m_xkbButtons.insert(Qt::MiddleButton, Button2Mask);
m_xkbButtons.insert(Qt::RightButton, Button3Mask);
m_xkbButtons.insert(Qt::XButton1, Button4Mask);
m_xkbButtons.insert(Qt::XButton2, Button5Mask);
// get the initial state
if (m_xkbAvailable) {