[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krita/petrovic/popup-palette-ui] libs/ui: remove references to the popupcolortriangle class as it i
From:       Scott Petrovic <scottpetrovic () gmail ! com>
Date:       2016-10-25 20:15:49
Message-ID: E1bz88T-0003QO-6v () code ! kde ! org
[Download RAW message or body]

Git commit fc87456c4026ec7c6e7553d6ef8ff6587ac1df4f by Scott Petrovic.
Committed on 25/10/2016 at 20:15.
Pushed by scottpetrovic into branch 'petrovic/popup-palette-ui'.

remove references to the popupcolortriangle class as it is not used any more

M  +1    -44   libs/ui/kis_popup_palette.cpp

http://commits.kde.org/krita/fc87456c4026ec7c6e7553d6ef8ff6587ac1df4f

diff --git a/libs/ui/kis_popup_palette.cpp b/libs/ui/kis_popup_palette.cpp
index 23dce2a..e279639 100644
--- a/libs/ui/kis_popup_palette.cpp
+++ b/libs/ui/kis_popup_palette.cpp
@@ -48,49 +48,6 @@
 #include <kis_action.h>
 
 
-class PopupColorTriangle : public KoTriangleColorSelector
-{
-public:
-    PopupColorTriangle(const KoColorDisplayRendererInterface *displayRenderer, \
                QWidget* parent)
-        : KoTriangleColorSelector(displayRenderer, parent)
-        , m_dragging(false) {
-    }
-
-    ~PopupColorTriangle() override {}
-
-    void tabletEvent(QTabletEvent* event) override {
-        event->accept();
-        QMouseEvent* mouseEvent = 0;
-        switch (event->type()) {
-        case QEvent::TabletPress:
-            mouseEvent = new QMouseEvent(QEvent::MouseButtonPress, event->pos(),
-                                         Qt::LeftButton, Qt::LeftButton, \
                event->modifiers());
-            m_dragging = true;
-            mousePressEvent(mouseEvent);
-            break;
-        case QEvent::TabletMove:
-            mouseEvent = new QMouseEvent(QEvent::MouseMove, event->pos(),
-                                         (m_dragging) ? Qt::LeftButton : \
                Qt::NoButton,
-                                         (m_dragging) ? Qt::LeftButton : \
                Qt::NoButton, event->modifiers());
-            mouseMoveEvent(mouseEvent);
-            break;
-        case QEvent::TabletRelease:
-            mouseEvent = new QMouseEvent(QEvent::MouseButtonRelease, event->pos(),
-                                         Qt::LeftButton,
-                                         Qt::LeftButton,
-                                         event->modifiers());
-            m_dragging = false;
-            mouseReleaseEvent(mouseEvent);
-            break;
-        default: break;
-        }
-        delete mouseEvent;
-    }
-
-private:
-    bool m_dragging;
-};
-
 KisPopupPalette::KisPopupPalette(KisViewManager* viewManager, \
KisFavoriteResourceManager* manager, const KoColorDisplayRendererInterface \
*displayRenderer, KisCanvasResourceProvider *provider, QWidget *parent)  : \
QWidget(parent, Qt::FramelessWindowHint)  , m_resourceManager(manager)
@@ -116,7 +73,7 @@ KisPopupPalette::KisPopupPalette(KisViewManager* viewManager, \
KisFavoriteResourc  m_actionCollection = viewManager->actionCollection();
 
     const int borderWidth = 3;
-    //m_triangleColorSelector  = new PopupColorTriangle(displayRenderer, this);
+
     m_triangleColorSelector = new KisVisualColorSelector(this);
     m_triangleColorSelector->setDisplayRenderer(displayRenderer);
     m_triangleColorSelector->setConfig(true,false);


[prev in list] [next in list] [prev in thread] [next in thread]