Differential D2259 Diff 5435 plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp

Changeset View

Standalone View

View Options

plugins/dockers/advancedcolorselector/kis_color_selector_base.cpp

Context not available.
48 setWindowFlags(Qt::ToolTip); 48​ setWindowFlags(Qt::ToolTip);
49 setQColor(QColor(0,0,0)); 49​ setQColor(QColor(0,0,0));
50 setMouseTracking(true); 50​ setMouseTracking(true);
51​ m_baseColor = Qt::black;
52​ m_previousColor = Qt::black;
51 } 53​ }
52 54​
53 void show() 55​ void show()
Context not available.
70 } else { 72​ } else {
71 targetPos = QPoint(parentPos.x(), parentPos.y() + m_parent->height()); 73​ targetPos = QPoint(parentPos.x(), parentPos.y() + m_parent->height());
72 } 74​ }
73 setGeometry(targetPos.x(), targetPos.y(), 100, 100); 75​ setGeometry(targetPos.x(), targetPos.y(), 100, 165);
76​ setAttribute(Qt::WA_TranslucentBackground);
74 } 77​ }
75 78​
76 void setQColor(const QColor& color) 79​ void setQColor(const QColor& color)
Context not available.
79 update(); 82​ update();
80 } 83​ }
81 84​
85​ void setPreviousQColor(const QColor& color)
86​ {
87​ m_previousColor = m_baseColor;
88​ m_baseColor = color;
89​ update();
90​ }
91​
82protected: 92​protected:
83 void paintEvent(QPaintEvent *e) { 93​ void paintEvent(QPaintEvent *e) {
84 Q_UNUSED(e); 94​ Q_UNUSED(e);
85 QPainter p(this); 95​ QPainter p(this);
86 p.fillRect(0,0, width(), width(), m_color); 96​ p.fillRect(0, 0, width(), width(), m_color);
97​ p.fillRect(35, width(), width(), height(), m_previousColor);
87 } 98​ }
88 99​
89private: 100​private:
90 KisColorSelectorBase* m_parent; 101​ KisColorSelectorBase* m_parent;
91 QColor m_color; 102​ QColor m_color;
103​ QColor m_baseColor;
104​ QColor m_previousColor;
92}; 105​};
93 106​
94KisColorSelectorBase::KisColorSelectorBase(QWidget *parent) : 107​KisColorSelectorBase::KisColorSelectorBase(QWidget *parent) :
Context not available.
426 m_colorPreviewPopup->setQColor(converter()->toQColor(color)); 439​ m_colorPreviewPopup->setQColor(converter()->toQColor(color));
427} 440​}
428 441​
442​void KisColorSelectorBase::updatePreviousColorPreview(const KoColor &color)
443​{
444​ m_colorPreviewPopup->setPreviousQColor(converter()->toQColor(color));
445​}
446​
429void KisColorSelectorBase::canvasResourceChanged(int key, const QVariant &v) 447​void KisColorSelectorBase::canvasResourceChanged(int key, const QVariant &v)
430{ 448​{
431 if (key == KoCanvasResourceManager::ForegroundColor || key == KoCanvasResourceManager::BackgroundColor) { 449​ if (key == KoCanvasResourceManager::ForegroundColor || key == KoCanvasResourceManager::BackgroundColor) {
Context not available.