From d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Mon, 28 May 2012 14:15:52 +0000 Subject: merged with release_2_0 --- muse2/muse/widgets/pixmap_button.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'muse2/muse/widgets/pixmap_button.cpp') diff --git a/muse2/muse/widgets/pixmap_button.cpp b/muse2/muse/widgets/pixmap_button.cpp index 6b706474..3bc8d16c 100644 --- a/muse2/muse/widgets/pixmap_button.cpp +++ b/muse2/muse/widgets/pixmap_button.cpp @@ -147,8 +147,6 @@ void PixmapButton::paintEvent(QPaintEvent* e) void PixmapButton::mousePressEvent(QMouseEvent* e) { - //if(e->button() != Qt::LeftButton) - // return; if(_checkable) _checked = !_checked; update(); @@ -158,17 +156,20 @@ void PixmapButton::mousePressEvent(QMouseEvent* e) emit toggled(_checked); //e->setAccepted(true); // This makes menu not close when mouse is released. May be desireable with many small buttons... - QWidget::mousePressEvent(e); + QWidget::mousePressEvent(e); // Hm, need this so menus can close. } void PixmapButton::mouseReleaseEvent(QMouseEvent* e) { - //if(e->button() != Qt::LeftButton) - // return; emit clicked(_checked); //e->setAccepted(true); // This makes menu not close when mouse is released. May be desireable with many small buttons... - QWidget::mouseReleaseEvent(e); + QWidget::mouseReleaseEvent(e); // Hm, need this so menus can close. +} + +void PixmapButton::contextMenuEvent(QContextMenuEvent * e) +{ + e->accept(); } } // MusEGui \ No newline at end of file -- cgit v1.2.3