Commit b440e55a authored by Wolthera van Hövell's avatar Wolthera van Hövell 🛍

Fix a bunch of minor issues.

parent 6655f984
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>220</width> <width>225</width>
<height>50</height> <height>50</height>
</size> </size>
</property> </property>
......
...@@ -53,6 +53,7 @@ KisScreenColorPicker::KisScreenColorPicker(QWidget *parent) : QWidget(parent), m ...@@ -53,6 +53,7 @@ KisScreenColorPicker::KisScreenColorPicker(QWidget *parent) : QWidget(parent), m
this->setLayout(layout); this->setLayout(layout);
m_d->screenColorPickerButton = new QPushButton(); m_d->screenColorPickerButton = new QPushButton();
m_d->screenColorPickerButton->setIcon(kisIcon("krita_tool_color_picker")); m_d->screenColorPickerButton->setIcon(kisIcon("krita_tool_color_picker"));
m_d->screenColorPickerButton->setMinimumHeight(25);
this->layout()->addWidget(m_d->screenColorPickerButton); this->layout()->addWidget(m_d->screenColorPickerButton);
m_d->lblScreenColorInfo = new QLabel(QLatin1String("\n")); m_d->lblScreenColorInfo = new QLabel(QLatin1String("\n"));
this->layout()->addWidget(m_d->lblScreenColorInfo); this->layout()->addWidget(m_d->lblScreenColorInfo);
......
...@@ -353,7 +353,7 @@ KoColor KisVisualColorSelectorShape::convertShapeCoordinateToKoColor(QPointF coo ...@@ -353,7 +353,7 @@ KoColor KisVisualColorSelectorShape::convertShapeCoordinateToKoColor(QPointF coo
maxvalue.fill(1.0); maxvalue.fill(1.0);
if (m_d->displayRenderer if (m_d->displayRenderer
&& m_d->displayRenderer->getPaintingColorSpace()==m_d->cs && m_d->displayRenderer->getPaintingColorSpace()==m_d->cs
&& m_d->cs->colorDepthId().id().contains("f")) { && m_d->cs->colorDepthId().id().contains("F")) {
for (int ch = 0; ch<maxvalue.size(); ch++) { for (int ch = 0; ch<maxvalue.size(); ch++) {
KoChannelInfo *channel = m_d->cs->channels()[ch]; KoChannelInfo *channel = m_d->cs->channels()[ch];
maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel); maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel);
...@@ -462,7 +462,7 @@ QPointF KisVisualColorSelectorShape::convertKoColorToShapeCoordinate(KoColor c) ...@@ -462,7 +462,7 @@ QPointF KisVisualColorSelectorShape::convertKoColorToShapeCoordinate(KoColor c)
maxvalue.fill(1.0); maxvalue.fill(1.0);
if (m_d->displayRenderer if (m_d->displayRenderer
&& m_d->displayRenderer->getPaintingColorSpace()==m_d->cs && m_d->displayRenderer->getPaintingColorSpace()==m_d->cs
&& m_d->cs->colorDepthId().id().contains("f")) { && m_d->cs->colorDepthId().id().contains("F")) {
for (int ch = 0; ch<maxvalue.size(); ch++) { for (int ch = 0; ch<maxvalue.size(); ch++) {
KoChannelInfo *channel = m_d->cs->channels()[ch]; KoChannelInfo *channel = m_d->cs->channels()[ch];
maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel); maxvalue[ch] = m_d->displayRenderer->maxVisibleFloatValue(channel);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment