From 57e65aab7f6f54524168c6812fac7e7dbb700ab9 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 4 May 2013 20:31:02 +0200 Subject: 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 --- src/dolphinmainwindow.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/dolphinmainwindow.cpp') 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()); -- cgit v1.3