diff --git a/limereport/objectinspector/editors/lrcoloreditor.cpp b/limereport/objectinspector/editors/lrcoloreditor.cpp index e845d76..b0f4c19 100644 --- a/limereport/objectinspector/editors/lrcoloreditor.cpp +++ b/limereport/objectinspector/editors/lrcoloreditor.cpp @@ -100,11 +100,12 @@ void ColorIndicator::paintEvent(QPaintEvent* event) QPainter painter(this); painter.save(); painter.setBrush(m_color); - painter.setPen(Qt::gray); + painter.setPen(Qt::transparent); QRect rect = event->rect().adjusted(3,3,-4,-4); rect.setWidth(rect.height()); painter.setRenderHint(QPainter::Antialiasing); - painter.drawEllipse(rect); +// painter.drawEllipse(rect); + painter.drawRoundedRect(rect,2,2); painter.restore(); } diff --git a/limereport/objectinspector/propertyItems/lrcolorpropitem.cpp b/limereport/objectinspector/propertyItems/lrcolorpropitem.cpp index 8201e22..4eed649 100644 --- a/limereport/objectinspector/propertyItems/lrcolorpropitem.cpp +++ b/limereport/objectinspector/propertyItems/lrcolorpropitem.cpp @@ -60,20 +60,22 @@ bool ColorPropItem::paint(QPainter *painter, const StyleOptionViewItem &option, painter->save(); QPen pen; - if (option.state & QStyle::State_Selected){ - pen.setWidth(2); - pen.setColor(option.palette.brightText().color()); - }else { - pen.setColor(Qt::gray); - } +// if (option.state & QStyle::State_Selected){ +// pen.setWidth(1); +// pen.setColor(option.palette.brightText().color()); +// }else { +// pen.setColor(Qt::darkGray); +// } + pen.setColor(Qt::transparent); painter->setPen(pen); painter->setBrush(propertyValue().value()); QRect rect = option.rect.adjusted(4,4,-4,-6); rect.setWidth(rect.height()); painter->setRenderHint(QPainter::Antialiasing); - painter->drawEllipse(rect); + painter->drawRoundedRect(rect,2,2); +// painter->drawEllipse(rect); painter->restore(); return true; } else return false;