Differential D12682 Diff 33781 plugins/dockers/animation/timeline_frames_item_delegate.cpp

Changeset View

Standalone View

View Options

plugins/dockers/animation/timeline_frames_item_delegate.cpp

Context not available.
21#include <QPen> 21​#include <QPen>
22#include <QPainter> 22​#include <QPainter>
23#include <QApplication> 23​#include <QApplication>
24 24​#include "krita_utils.h"
25#include "timeline_frames_model.h" 25​#include "timeline_frames_model.h"
26#include "timeline_color_scheme.h" 26​#include "timeline_color_scheme.h"
27 27​
Context not available.
73 73​
74void TimelineFramesItemDelegate::paintSpecialKeyframeIndicator(QPainter *painter, const QModelIndex &index, const QRect &rc) 74​void TimelineFramesItemDelegate::paintSpecialKeyframeIndicator(QPainter *painter, const QModelIndex &index, const QRect &rc)
75{ 75​{
76​
76 bool active = index.data(TimelineFramesModel::ActiveLayerRole).toBool(); 77​ bool active = index.data(TimelineFramesModel::ActiveLayerRole).toBool();
77 bool framePresent = index.data(TimelineFramesModel::FrameExistsRole).toBool(); 78​ bool framePresent = index.data(TimelineFramesModel::FrameExistsRole).toBool();
dkazakovUnsubmitted
Not Done

framePresent and active variables are now unused. I guess it should somehow break rendering of the opacity frames...

dkazakov: `framePresent` and `active` variables are now unused. I guess it should somehow break rendering…
78 bool editable = index.data(TimelineFramesModel::FrameEditableRole).toBool(); 79​ bool editable = index.data(TimelineFramesModel::FrameEditableRole).toBool();
79 80​
80 QColor color = TimelineColorScheme::instance()->frameColor(!framePresent, active); 81​ QColor color = qApp->palette().color(QPalette::Highlight);
82​
81 83​
82 if (!editable && color.alpha() > 0) { 84​ if (!editable && color.alpha() > 0) {
83 const int l = color.lightness(); 85​ const int l = color.lightness();
Context not available.
105 107​
106void TimelineFramesItemDelegate::drawBackground(QPainter *painter, const QModelIndex &index, const QRect &rc) const 108​void TimelineFramesItemDelegate::drawBackground(QPainter *painter, const QModelIndex &index, const QRect &rc) const
107{ 109​{
108 bool active = index.data(TimelineFramesModel::ActiveLayerRole).toBool(); 110​ /// is the current layer actively selected (this is not the same as visibility)
109 bool present = index.data(TimelineFramesModel::FrameExistsRole).toBool(); 111​ bool hasActiveLayerRole = index.data(TimelineFramesModel::ActiveLayerRole).toBool();
110 bool editable = index.data(TimelineFramesModel::FrameEditableRole).toBool(); 112​ bool doesFrameExist = index.data(TimelineFramesModel::FrameExistsRole).toBool(); /// does keyframe exist
113​ bool isEditable = index.data(TimelineFramesModel::FrameEditableRole).toBool(); /// is layer editable
dkazakovUnsubmitted
Not Done

isEditable variable is now unused. It means that the layer doesn't change its color when is becomes invisible/locked, which is a regression.

dkazakov: `isEditable` variable is now unused. It means that the layer doesn't change its color when is…
114​ bool hasContent = index.data(TimelineFramesModel::FrameHasContent).toBool(); /// find out if frame is empty
115​
116​ QColor color; // will get re-used for determining color
117​ QColor noLabelSetColor = qApp->palette().color(QPalette::Highlight); // if no color label is used
118​
119​
120​ // pass for filling in the active row with slightly color difference
121​ if (hasActiveLayerRole && !doesFrameExist) {
122​ QColor highlightColor = qApp->palette().color(QPalette::Highlight);
123​ QColor baseColor = qApp->palette().color(QPalette::Base);
124​
125​ color = KritaUtils::blendColors(baseColor, highlightColor, 0.8);
126​
127​ painter->fillRect(rc, color);
128​ }
129​
130​
131​
132​
133​ // assign background color for frame depending on if the frame has a color label or not
111 QVariant colorLabel = index.data(TimelineFramesModel::FrameColorLabelIndexRole); 134​ QVariant colorLabel = index.data(TimelineFramesModel::FrameColorLabelIndexRole);
135​ color = labelColors.at(colorLabel.toInt());
112 136​
113 QColor color = colorLabel.isValid() ? labelColors.at(colorLabel.toInt()) : ​
114 TimelineColorScheme::instance()->frameColor(present, active); ​
115 137​
116 if (!editable && color.alpha() > 0) { 138​ // if color label is not valid, calculate the normal value
117 const int l = color.lightness(); 139​ if (!colorLabel.isValid()) {
118 color = QColor(l, l, l); 140​ color = noLabelSetColor;
141​ }
142​
143​ // how do we fill in a frame that has content
144​ // a keyframe will be totally filled in. A hold frame will have a line running through it
145​ if (hasContent && doesFrameExist) {
146​ painter->fillRect(rc, color);
119 } 147​ }
120 148​
121 painter->fillRect(rc, color); 149​
150​
151​ // pass of outline for empty keyframes
152​ if (doesFrameExist && !hasContent) {
153​
154​ QPen oldPen = painter->pen();
155​ QBrush oldBrush(painter->brush());
156​
157​ painter->setPen(QPen(color, 2));
158​ painter->setBrush(Qt::NoBrush);
159​ painter->drawRect(rc);
160​
161​ painter->setBrush(oldBrush);
162​ painter->setPen(oldPen);
163​ }
164​
165​
166​ // pass of hold frame line
167​ if (!doesFrameExist && hasContent) {
168​
169​ // pretty much the same check as "isValid" above, but that isn't working with hold frames
170​ if (colorLabel.toInt() == 0) {
171​ color = noLabelSetColor;
172​ }
173​
174​
175​ QPoint lineStart(rc.x(), (rc.y() + rc.height()/2));
176​ QPoint lineEnd(rc.x() + rc.width()-2, (rc.y() + rc.height()/2));
177​
178​ QPen holdFramePen(color);
179​ holdFramePen.setWidth(3);
180​
181​ painter->setPen(holdFramePen);
182​ painter->drawLine(QLine(lineStart, lineEnd));
183​ }
184​
185​
186​
122} 187​}
123 188​
124void TimelineFramesItemDelegate::drawFocus(QPainter *painter, 189​void TimelineFramesItemDelegate::drawFocus(QPainter *painter,
Context not available.
146void TimelineFramesItemDelegate::paint(QPainter *painter, 211​void TimelineFramesItemDelegate::paint(QPainter *painter,
147 const QStyleOptionViewItem &option, 212​ const QStyleOptionViewItem &option,
148 const QModelIndex &index) const 213​ const QModelIndex &index) const
149{ 214​{
215​ // draws background as well as fills normal keyframes
150 drawBackground(painter, index, option.rect); 216​ drawBackground(painter, index, option.rect);
151 217​
218​ // creates a semi transparent orange rectangle in the frame that is actively selected on the active row
152 if (option.showDecorationSelected && 219​ if (option.showDecorationSelected &&
153 (option.state & QStyle::State_Selected)) { 220​ (option.state & QStyle::State_Selected)) {
154 ​
155 QPalette::ColorGroup cg = option.state & QStyle::State_Enabled 221​ QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
156 ? QPalette::Normal : QPalette::Disabled; 222​ ? QPalette::Normal : QPalette::Disabled;
157 if (cg == QPalette::Normal && !(option.state & QStyle::State_Active)) 223​ if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
Context not available.
165 painter->setOpacity(oldOpacity); 231​ painter->setOpacity(oldOpacity);
166 } 232​ }
167 233​
234​ // not sure what this is drawing
168 drawFocus(painter, option, option.rect); 235​ drawFocus(painter, option, option.rect);
169 236​
237​ // opacity keyframe, but NOT normal keyframes
170 bool specialKeys = index.data(TimelineFramesModel::SpecialKeyframeExists).toBool(); 238​ bool specialKeys = index.data(TimelineFramesModel::SpecialKeyframeExists).toBool();
171 if (specialKeys) { 239​ if (specialKeys) {
172 paintSpecialKeyframeIndicator(painter, index, option.rect); 240​ paintSpecialKeyframeIndicator(painter, index, option.rect);
173 } 241​ }
174 242​
243​ // creates a border and dot on the selected frame on the active row
175 bool active = index.data(TimelineFramesModel::ActiveFrameRole).toBool(); 244​ bool active = index.data(TimelineFramesModel::ActiveFrameRole).toBool();
176 bool layerIsCurrent = index.data(TimelineFramesModel::ActiveLayerRole).toBool(); 245​ bool layerIsCurrent = index.data(TimelineFramesModel::ActiveLayerRole).toBool();
177 if (active) { 246​ if (active) {
Context not available.