Differential D9665 Diff 24736 libs/ui/widgets/kis_screen_color_picker.cpp

Changeset View

Standalone View

View Options

libs/ui/widgets/kis_screen_color_picker.cpp

Context not available.
56 QVBoxLayout *layout = new QVBoxLayout(); 56​ QVBoxLayout *layout = new QVBoxLayout();
57 this->setLayout(layout); 57​ this->setLayout(layout);
58 m_d->screenColorPickerButton = new QPushButton(); 58​ m_d->screenColorPickerButton = new QPushButton();
59 m_d->screenColorPickerButton->setIcon(kisIcon("krita_tool_color_picker")); 59​
60 m_d->screenColorPickerButton->setMinimumHeight(25); 60​ m_d->screenColorPickerButton->setMinimumHeight(25);
61 this->layout()->addWidget(m_d->screenColorPickerButton); 61​ this->layout()->addWidget(m_d->screenColorPickerButton);
62 m_d->lblScreenColorInfo = new QLabel(QLatin1String("\n")); 62​ m_d->lblScreenColorInfo = new QLabel(QLatin1String("\n"));
63 this->layout()->addWidget(m_d->lblScreenColorInfo); 63​ this->layout()->addWidget(m_d->lblScreenColorInfo);
64 connect(m_d->screenColorPickerButton, SIGNAL(clicked()), SLOT(pickScreenColor())); 64​ connect(m_d->screenColorPickerButton, SIGNAL(clicked()), SLOT(pickScreenColor()));
65​
66​ updateIcons();
67​
65#ifdef Q_OS_WIN32 68​#ifdef Q_OS_WIN32
66 m_d->updateTimer = new QTimer(this); 69​ m_d->updateTimer = new QTimer(this);
67 m_d->dummyTransparentWindow.resize(1, 1); 70​ m_d->dummyTransparentWindow.resize(1, 1);
Context not available.
74{ 77​{
75} 78​}
76 79​
80​void KisScreenColorPicker::updateIcons()
81​{
82​ m_d->screenColorPickerButton->setIcon(kisIcon("krita_tool_color_picker"));
83​}
84​
77KoColor KisScreenColorPicker::currentColor() 85​KoColor KisScreenColorPicker::currentColor()
78{ 86​{
79 return m_d->currentColor; 87​ return m_d->currentColor;
Context not available.
262} 270​}
263 271​
264 272​
273​
265#include "kis_screen_color_picker.moc" 274​#include "kis_screen_color_picker.moc"
Context not available.