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

List:       kde-commits
Subject:    koffice/krita/ui
From:       Sven Langkamp <sven.langkamp () gmail ! com>
Date:       2010-10-21 15:00:06
Message-ID: 20101021150006.4A236AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1188162 by langkamp:

fix popup palette slowness when chosing a color with the tablet
BUG:253826


 M  +11 -1     kis_popup_palette.cpp  
 M  +2 -0      kis_popup_palette.h  


--- trunk/koffice/krita/ui/kis_popup_palette.cpp #1188161:1188162
@@ -94,6 +94,11 @@
     connect(m_timer, SIGNAL(timeout()), this, SLOT(slotEnableChangeFGColor()));
     connect(this, SIGNAL(sigEnableChangeFGColor(bool)), m_resourceManager, \
SIGNAL(sigEnableChangeColor(bool)));  
+    m_colorChangeTimer = new QTimer(this);
+    m_colorChangeTimer->setInterval(50);
+    m_colorChangeTimer->setSingleShot(true);
+    connect(m_colorChangeTimer, SIGNAL(timeout()), this, \
SLOT(slotColorChangeTimeout())); +    
     setMouseTracking(true);
     setHoveredBrush(-1);
     setHoveredColor(-1);
@@ -116,7 +121,12 @@
 
 void KisPopupPalette::slotChangefGColor(const QColor& newColor)
 {
-    KoColor color (newColor, KoColorSpaceRegistry::instance()->rgb16(0));
+    m_colorChangeTimer->start();
+}
+
+void KisPopupPalette::slotColorChangeTimeout()
+{
+    KoColor color ( m_triangleColorSelector->color(), \
KoColorSpaceRegistry::instance()->rgb16(0));  emit sigChangefGColor(color);
 }
 
--- trunk/koffice/krita/ui/kis_popup_palette.h #1188161:1188162
@@ -96,6 +96,7 @@
     KoTriangleColorSelector* m_triangleColorSelector;
 
     QTimer* m_timer;
+    QTimer* m_colorChangeTimer;
 
 signals:
     void sigChangeActivePaintop(int);
@@ -112,6 +113,7 @@
 
 private slots:
     void slotChangefGColor(const QColor& newColor);
+    void slotColorChangeTimeout();
 
     void slotTriggerTimer();
     void slotEnableChangeFGColor();


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