X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcolorpickerwidget.cpp;h=a9b8ce860973cb5aa22c3ad999bbf04efcb15664;hb=29ceabd2afc227e0fb8b586c567eeaf7921b542e;hp=14daf208c8a024c0004842e82eccda0edd94acc8;hpb=4d988e59ca8f3ce0d53250aab4f2f1c6d5ae3b54;p=kdenlive

diff --git a/src/colorpickerwidget.cpp b/src/colorpickerwidget.cpp
index 14daf208..a9b8ce86 100644
--- a/src/colorpickerwidget.cpp
+++ b/src/colorpickerwidget.cpp
@@ -135,12 +135,14 @@ void ColorPickerWidget::slotGetAverageColor()
         emit displayMessage(i18n("Calculated average color for rectangle."), -1);
 
     emit colorPicked(QColor(sumR / numPixel, sumG / numPixel, sumB / numPixel));
+    emit disableCurrentFilter(false);
 }
 
 void ColorPickerWidget::mousePressEvent(QMouseEvent* event)
 {
     if (event->button() != Qt::LeftButton) {
         closeEventFilter();
+	emit disableCurrentFilter(false);
         event->accept();
         return;
     }
@@ -165,12 +167,12 @@ void ColorPickerWidget::mouseReleaseEvent(QMouseEvent *event)
         if (m_grabRect.width() * m_grabRect.height() == 0) {
 	    m_grabRectFrame->hide();
             emit colorPicked(grabColor(event->globalPos()));
+	    emit disableCurrentFilter(false);
         } else {
             // delay because m_grabRectFrame does not hide immediately
             connect(m_grabRectFrame, SIGNAL(getColor()), this, SLOT(slotGetAverageColor()));
 	    m_grabRectFrame->hide();
         }
-
         return;
     }
     QWidget::mouseReleaseEvent(event);
@@ -188,6 +190,7 @@ void ColorPickerWidget::mouseMoveEvent(QMouseEvent* event)
 
 void ColorPickerWidget::slotSetupEventFilter()
 {
+    emit disableCurrentFilter(true);
     m_filterActive = true;
     setFocus();
     installEventFilter(this);
@@ -208,6 +211,7 @@ bool ColorPickerWidget::eventFilter(QObject *object, QEvent *event)
     // Close color picker on any key press
     if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride) {
         closeEventFilter();
+	emit disableCurrentFilter(false);
         event->setAccepted(true);
         return true;
     }