summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/okeyconfigwidget.cpp7
-rw-r--r--libopie2/opieui/opieui.pro2
2 files changed, 6 insertions, 3 deletions
diff --git a/libopie2/opieui/okeyconfigwidget.cpp b/libopie2/opieui/okeyconfigwidget.cpp
index 8967d77..ef6d713 100644
--- a/libopie2/opieui/okeyconfigwidget.cpp
+++ b/libopie2/opieui/okeyconfigwidget.cpp
@@ -1187,14 +1187,15 @@ void OKeyChooserConfigDialog::keyPressEvent( QKeyEvent* ev ) {
break;
default:
break;
}
- if (mod )
+ if (mod ) {
m_mod |= mod;
- else
+ key = 0;
+ }else
m_key = key;
- if ( ( !mod || m_key ) && !m_timer->isActive() )
+ if ( ( !mod || m_key || key ) && !m_timer->isActive() )
m_timer->start( 150, true );
m_keyPair = OKeyPair( m_key, m_mod );
}
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro
index 0749f7d..e97e82c 100644
--- a/libopie2/opieui/opieui.pro
+++ b/libopie2/opieui/opieui.pro
@@ -4,8 +4,9 @@ DESTDIR = $(OPIEDIR)/lib
HEADERS = oclickablelabel.h \
odialog.h \
ofontselector.h \
oimageeffect.h \
+ okeyconfigwidget.h \
olistview.h \
opixmapeffect.h \
opopupmenu.h \
opixmapprovider.h \
@@ -24,8 +25,9 @@ HEADERS = oclickablelabel.h \
SOURCES = oclickablelabel.cpp \
odialog.cpp \
ofontselector.cpp \
oimageeffect.cpp \
+ okeyconfigwidget.cpp \
olistview.cpp \
opixmapeffect.cpp \
opopupmenu.cpp \
opixmapprovider.cpp \