aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Fabio Bas2010-07-12 14:15:59 +0000
committerGravatar Fabio Bas2010-07-12 14:15:59 +0000
commit04e6aeaec6990a04a915469e3e39d0cee6019de4 (patch)
tree5fbc8704de2a8395cfc2961fbd07c8b611a26725 /src
parentadded workaround for #791, please test (diff)
downloadKVIrc-04e6aeaec6990a04a915469e3e39d0cee6019de4.tar.gz
KVIrc-04e6aeaec6990a04a915469e3e39d0cee6019de4.tar.bz2
KVIrc-04e6aeaec6990a04a915469e3e39d0cee6019de4.zip
disable builtin qmainwindow context popup (it overrides our popup in the macosx and kde implementations)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4653 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/kvi_frame.cpp6
-rw-r--r--src/kvirc/ui/kvi_frame.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index c064ed6d5..a2be5b98a 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -827,6 +827,12 @@ void KviFrame::resizeEvent(QResizeEvent *e)
KviTalMainWindow::resizeEvent(e);
}
+
+void KviFrame::contextMenuEvent(QContextMenuEvent *)
+{
+ // do nothing! avoids builtin popup from qmainwindow
+}
+
void KviFrame::updatePseudoTransparency()
{
#ifdef COMPILE_PSEUDO_TRANSPARENCY
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index a96296109..539468b29 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -204,6 +204,7 @@ protected:
virtual void moveEvent(QMoveEvent *e);
virtual bool focusNextPrevChild(bool next);
virtual void changeEvent(QEvent * event);
+ virtual void contextMenuEvent(QContextMenuEvent * event);
void updatePseudoTransparency();
void installAccelerators();