diff options
| author | David Faure <[email protected]> | 2013-05-04 20:31:02 +0200 |
|---|---|---|
| committer | David Faure <[email protected]> | 2013-05-05 22:42:49 +0200 |
| commit | 57e65aab7f6f54524168c6812fac7e7dbb700ab9 (patch) | |
| tree | 003f656f1e6d91abd5b7893c4c536877e880ab4f /src/dolphinmainwindow.cpp | |
| parent | 926ed302d6b64c200d56817b62eeecb5abd5fd4f (diff) | |
Reimplement handling of Shift while showing menu without KModifierKeyInfo
Finding out whether shift is pressed initially can be done
with qApp->keyboardModifiers(), and finding out that the user is pressing
or release shift can be done with keyPressEvent/keyReleaseEvent.
This required to inherit from KMenu rather than having the KMenu
as a member.
KModifierKeyInfo is only implemented on X11, so this makes the code
more portable. If similar solutions can be found for other users of
KModifierKeyInfo, it will be deprecated in KF5.
REVIEW: 110303
Diffstat (limited to 'src/dolphinmainwindow.cpp')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 8ed31dea4..347489d6b 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -120,11 +120,6 @@ DolphinMainWindow::DolphinMainWindow() : m_updateToolBarTimer(0), m_lastHandleUrlStatJob(0) { - // Workaround for a X11-issue in combination with KModifierInfo - // (see DolphinContextMenu::initializeModifierKeyInfo() for - // more information): - DolphinContextMenu::initializeModifierKeyInfo(); - setObjectName("Dolphin#"); m_viewTab.append(ViewTab()); |