summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-08-13 16:39:38 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-08-15 15:39:23 +0300
commit43c32fac0c791e70bd7f430284ce70213946453e (patch)
tree6b013774380b40bc7a3a716ddcb35734750a3c8d
parent5a38591d0c30d5e639f9cc466b0ff8246376cfff (diff)
highlight toggled curve editor controls
Add a 'toggled' visual (different border color) to the 'maximize graph' and 'toggle gradient color' buttons. Task-number: QT3DS-3855 Change-Id: I4189c5fc2fb26431dce9361b624e38273e6d3d0f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
-rw-r--r--src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/RowTree.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/RowTree.cpp b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
index 6862c2bd..3d2e2c57 100644
--- a/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
+++ b/src/Authoring/Qt3DStudio/Palettes/TimelineGraphicsView/ui/RowTree.cpp
@@ -343,10 +343,14 @@ void RowTree::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
if (m_PropBinding->animationType() == qt3dsdm::EAnimationTypeBezier) {
m_rectMaximizePropGraph.setRect(rightDividerX() - 16 * 1.2,
TimelineConstants::ROW_H, ICON_SIZE, ICON_SIZE);
+ painter->setPen(m_propGraphHeight != TimelineConstants::ROW_GRAPH_H && !m_locked
+ ? CStudioPreferences::getBezierControlColor()
+ : CStudioPreferences::studioColor3());
+ painter->drawRect(m_rectMaximizePropGraph);
+
m_rectFitPropGraph.setRect(rightDividerX() - 16 * 2.4, TimelineConstants::ROW_H,
ICON_SIZE, ICON_SIZE);
painter->setPen(CStudioPreferences::studioColor3());
- painter->drawRect(m_rectMaximizePropGraph);
painter->drawRect(m_rectFitPropGraph);
painter->drawPixmap(m_rectMaximizePropGraph, m_locked ? pixMaximizeDisabled
: pixMaximize);
@@ -355,6 +359,9 @@ void RowTree::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
if (m_rowTimeline->isColorProperty()) {
m_rectColorGradient.setRect(rightDividerX() - 16 * 3.6,
TimelineConstants::ROW_H, ICON_SIZE, ICON_SIZE);
+ painter->setPen(m_rowTimeline->m_drawColorGradient && !m_locked
+ ? CStudioPreferences::getBezierControlColor()
+ : CStudioPreferences::studioColor3());
painter->drawRect(m_rectColorGradient);
painter->drawPixmap(m_rectColorGradient, m_locked ? pixGradientDisabled
: pixGradient);