[TD]Fix Dimension Color Regression

- still an issue where text looses select color if
  clicked while selected
This commit is contained in:
wandererfan
2019-09-29 16:19:42 -04:00
committed by WandererFan
parent 5f619c6743
commit d7dabeb885
3 changed files with 23 additions and 2 deletions

View File

@@ -168,6 +168,13 @@ void QGCustomText::setPrettySel() {
update();
}
void QGCustomText::setColor(QColor c)
{
m_colNormal = c;
m_colCurrent = c;
QGraphicsTextItem::setDefaultTextColor(c);
}
void QGCustomText::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) {
QStyleOptionGraphicsItem myOption(*option);
myOption.state &= ~QStyle::State_Selected;

View File

@@ -66,8 +66,7 @@ public:
virtual QColor getNormalColor(void);
virtual QColor getPreColor(void);
virtual QColor getSelectColor(void);
virtual void setColor(QColor c) { m_colNormal = c;
setDefaultTextColor(c); }
virtual void setColor(QColor c);
void makeMark(double x, double y);
void makeMark(Base::Vector3d v);

View File

@@ -156,6 +156,8 @@ void QGIDatumLabel::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
hasHover = true;
if (!isSelected()) {
setPrettyPre();
} else {
setPrettySel();
}
QGraphicsItem::hoverEnterEvent(event);
}
@@ -170,7 +172,10 @@ void QGIDatumLabel::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
hasHover = false;
if (!isSelected()) {
setPrettyNormal();
} else {
setPrettySel();
}
QGraphicsItem::hoverLeaveEvent(event);
}
@@ -339,10 +344,20 @@ QGIViewDimension::QGIViewDimension() :
dimLines = new QGIDimLines();
addToGroup(dimLines);
dimLines->setNormalColor(getNormalColor());
dimLines->setPrettyNormal();
aHead1 = new QGIArrow();
addToGroup(aHead1);
aHead1->setNormalColor(getNormalColor());
aHead1->setFillColor(getNormalColor());
aHead1->setPrettyNormal();
aHead2 = new QGIArrow();
addToGroup(aHead2);
aHead2->setNormalColor(getNormalColor());
aHead2->setFillColor(getNormalColor());
aHead2->setPrettyNormal();
datumLabel->setZValue(ZVALUE::DIMENSION);
dimLines->setZValue(ZVALUE::DIMENSION);