removed magic colors from node items and moved to css
This commit is contained in:
@@ -67,3 +67,7 @@ QTreeView, QListView, QLineEdit, QMenu, QProgressBar, QPushButton::checked, Node
|
|||||||
/* Dark */
|
/* Dark */
|
||||||
background: #191919;
|
background: #191919;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NodeViewItemWidgetProxy {
|
||||||
|
qproperty-titlebarColor: #4040a0;
|
||||||
|
}
|
||||||
|
|||||||
@@ -67,3 +67,7 @@ QTreeView, QListView, QLineEdit, QMenu, QProgressBar, QPushButton::checked, Node
|
|||||||
/* Dark */
|
/* Dark */
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NodeViewItemWidgetProxy {
|
||||||
|
qproperty-titlebarColor: #a0a0ff;
|
||||||
|
}
|
||||||
|
|||||||
@@ -30,9 +30,6 @@ NodeViewEdge::NodeViewEdge(QGraphicsItem *parent) :
|
|||||||
QGraphicsLineItem(parent),
|
QGraphicsLineItem(parent),
|
||||||
edge_(nullptr)
|
edge_(nullptr)
|
||||||
{
|
{
|
||||||
// FIXME: This should probably be set to the text color in order to work on light themes
|
|
||||||
setPen(QPen(Qt::white, 2));
|
|
||||||
|
|
||||||
// Ensures this UI object is drawn behind other objects
|
// Ensures this UI object is drawn behind other objects
|
||||||
setZValue(-1);
|
setZValue(-1);
|
||||||
}
|
}
|
||||||
@@ -71,6 +68,13 @@ void NodeViewEdge::Adjust()
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void NodeViewEdge::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
|
||||||
|
{
|
||||||
|
setPen(QPen(widget->palette().color(QPalette::Text), 2));
|
||||||
|
|
||||||
|
QGraphicsLineItem::paint(painter, option, widget);
|
||||||
|
}
|
||||||
|
|
||||||
qreal NodeViewEdge::CalculateEdgeYPoint(NodeViewItem *item, int param_index, NodeViewItem *opposing)
|
qreal NodeViewEdge::CalculateEdgeYPoint(NodeViewItem *item, int param_index, NodeViewItem *opposing)
|
||||||
{
|
{
|
||||||
if (item->IsExpanded()) {
|
if (item->IsExpanded()) {
|
||||||
|
|||||||
@@ -35,6 +35,9 @@ public:
|
|||||||
|
|
||||||
void Adjust();
|
void Adjust();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
qreal CalculateEdgeYPoint(NodeViewItem* item, int param_index, NodeViewItem* opposing);
|
qreal CalculateEdgeYPoint(NodeViewItem* item, int param_index, NodeViewItem* opposing);
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,9 @@
|
|||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QStyleOptionGraphicsItem>
|
#include <QStyleOptionGraphicsItem>
|
||||||
|
|
||||||
|
#include "core.h"
|
||||||
#include "ui/icons/icons.h"
|
#include "ui/icons/icons.h"
|
||||||
|
#include "window/mainwindow/mainwindow.h"
|
||||||
|
|
||||||
const int kNodeViewItemBorderWidth = 2;
|
const int kNodeViewItemBorderWidth = 2;
|
||||||
const int kNodeViewItemWidth = 250;
|
const int kNodeViewItemWidth = 250;
|
||||||
@@ -50,19 +52,6 @@ NodeViewItem::NodeViewItem(QGraphicsItem *parent) :
|
|||||||
|
|
||||||
// Set default node connector size
|
// Set default node connector size
|
||||||
node_connector_size_ = font_metrics.height() / 3;
|
node_connector_size_ = font_metrics.height() / 3;
|
||||||
|
|
||||||
// FIXME: Magic "number"/magic "color" - allow this to be editable by the user
|
|
||||||
SetColor(QColor(48, 48, 192));
|
|
||||||
}
|
|
||||||
|
|
||||||
void NodeViewItem::SetColor(const QColor &color)
|
|
||||||
{
|
|
||||||
color_ = color;
|
|
||||||
|
|
||||||
// Create a light gradient based on this color
|
|
||||||
UpdateGradient();
|
|
||||||
|
|
||||||
update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeViewItem::SetNode(Node *n)
|
void NodeViewItem::SetNode(Node *n)
|
||||||
@@ -148,27 +137,28 @@ QPointF NodeViewItem::GetParameterTextPoint(int index)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
|
void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
|
||||||
{
|
{
|
||||||
|
// HACK for getting the main QWidget palette color (the `widget`'s palette uses the NodeView color instead which we
|
||||||
|
// don't want here)
|
||||||
|
QPalette app_pal = olive::core.main_window()->palette();
|
||||||
|
|
||||||
// Set up border, which will change color if selected
|
// Set up border, which will change color if selected
|
||||||
// FIXME: Color not configurable?
|
// FIXME: Color not configurable?
|
||||||
QPen border_pen(Qt::black, kNodeViewItemBorderWidth);
|
QPen border_pen(Qt::black, kNodeViewItemBorderWidth);
|
||||||
|
|
||||||
// FIXME: The text is always drawn white assuming the color will be dark - the intention is to provide preset
|
QPen text_pen(app_pal.color(QPalette::Text));
|
||||||
// colors that will always be dark for the user to choose, so this value can stay white.
|
|
||||||
QPen text_pen(Qt::white);
|
|
||||||
|
|
||||||
// FIXME: Same as text_pen
|
QBrush connector_brush(app_pal.color(QPalette::Text));
|
||||||
QBrush connector_brush(Qt::white);
|
|
||||||
|
|
||||||
// FIXME: Same as above
|
|
||||||
QBrush content_brush(QColor("#353535"));
|
|
||||||
|
|
||||||
painter->setPen(border_pen);
|
painter->setPen(border_pen);
|
||||||
|
|
||||||
if (expanded_ && node_ != nullptr) {
|
if (expanded_ && node_ != nullptr) {
|
||||||
|
|
||||||
|
|
||||||
|
painter->setBrush(app_pal.window());
|
||||||
|
|
||||||
// Draw background rect
|
// Draw background rect
|
||||||
painter->setBrush(content_brush);
|
|
||||||
painter->drawRect(rect());
|
painter->drawRect(rect());
|
||||||
|
|
||||||
// Set pen to draw text
|
// Set pen to draw text
|
||||||
@@ -178,7 +168,6 @@ void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||||||
|
|
||||||
// Store the text points which will steadily increase sa we loop
|
// Store the text points which will steadily increase sa we loop
|
||||||
|
|
||||||
|
|
||||||
// Loop through all the parameters
|
// Loop through all the parameters
|
||||||
QList<NodeParam*> node_params = node_->parameters();
|
QList<NodeParam*> node_params = node_->parameters();
|
||||||
for (int i=0;i<node_params.size();i++) {
|
for (int i=0;i<node_params.size();i++) {
|
||||||
@@ -206,13 +195,13 @@ void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Draw rect
|
// Draw rect
|
||||||
painter->setBrush(brush());
|
painter->setBrush(obj_proxy_.TitleBarColor());
|
||||||
painter->drawRect(title_bar_rect_);
|
painter->drawRect(title_bar_rect_);
|
||||||
|
|
||||||
// If selected, draw selection outline
|
// If selected, draw selection outline
|
||||||
if (option->state & QStyle::State_Selected) {
|
if (option->state & QStyle::State_Selected) {
|
||||||
QPen pen = painter->pen();
|
QPen pen = painter->pen();
|
||||||
pen.setColor(widget->palette().highlight().color());
|
pen.setColor(app_pal.color(QPalette::Highlight));
|
||||||
painter->setPen(pen);
|
painter->setPen(pen);
|
||||||
|
|
||||||
painter->setBrush(Qt::transparent);
|
painter->setBrush(Qt::transparent);
|
||||||
@@ -251,6 +240,9 @@ void NodeViewItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||||||
|
|
||||||
void NodeViewItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
void NodeViewItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
||||||
{
|
{
|
||||||
|
// We override standard mouse behavior in some cases. In these cases, we don't want the standard "move" and "release"
|
||||||
|
// events to trigger if we haven't already triggered the "press" event. We use this variable to determine whether
|
||||||
|
// base class behavior is valid here.
|
||||||
standard_click_ = false;
|
standard_click_ = false;
|
||||||
|
|
||||||
// Don't initiate a drag if we clicked the expand hitbox
|
// Don't initiate a drag if we clicked the expand hitbox
|
||||||
@@ -268,6 +260,7 @@ void NodeViewItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We aren't using any override behaviors, switch back to standard click behavior
|
||||||
standard_click_ = true;
|
standard_click_ = true;
|
||||||
QGraphicsRectItem::mousePressEvent(event);
|
QGraphicsRectItem::mousePressEvent(event);
|
||||||
}
|
}
|
||||||
@@ -291,11 +284,16 @@ void NodeViewItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NodeViewItem::UpdateGradient()
|
NodeViewItemWidgetProxy::NodeViewItemWidgetProxy()
|
||||||
{
|
{
|
||||||
/*QLinearGradient grad(QPointF(0, rect().top()), QPointF(0, rect().bottom()));
|
}
|
||||||
grad.setColorAt(0, color_.lighter(175));
|
|
||||||
grad.setColorAt(1, color_);
|
QColor NodeViewItemWidgetProxy::TitleBarColor()
|
||||||
setBrush(grad);*/
|
{
|
||||||
setBrush(color_);
|
return title_bar_color_;
|
||||||
|
}
|
||||||
|
|
||||||
|
void NodeViewItemWidgetProxy::SetTitleBarColor(QColor color)
|
||||||
|
{
|
||||||
|
title_bar_color_ = color;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,16 +24,27 @@
|
|||||||
#include <QFontMetrics>
|
#include <QFontMetrics>
|
||||||
#include <QGraphicsRectItem>
|
#include <QGraphicsRectItem>
|
||||||
#include <QLinearGradient>
|
#include <QLinearGradient>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
#include "node/node.h"
|
#include "node/node.h"
|
||||||
|
|
||||||
|
class NodeViewItemWidgetProxy : public QWidget {
|
||||||
|
Q_OBJECT
|
||||||
|
Q_PROPERTY(QColor titlebarColor READ TitleBarColor WRITE SetTitleBarColor DESIGNABLE true)
|
||||||
|
public:
|
||||||
|
NodeViewItemWidgetProxy();
|
||||||
|
|
||||||
|
QColor TitleBarColor();
|
||||||
|
void SetTitleBarColor(QColor color);
|
||||||
|
private:
|
||||||
|
QColor title_bar_color_;
|
||||||
|
};
|
||||||
|
|
||||||
class NodeViewItem : public QGraphicsRectItem
|
class NodeViewItem : public QGraphicsRectItem
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NodeViewItem(QGraphicsItem* parent = nullptr);
|
NodeViewItem(QGraphicsItem* parent = nullptr);
|
||||||
|
|
||||||
void SetColor(const QColor& color);
|
|
||||||
|
|
||||||
void SetNode(Node* n);
|
void SetNode(Node* n);
|
||||||
Node* node();
|
Node* node();
|
||||||
|
|
||||||
@@ -52,13 +63,11 @@ protected:
|
|||||||
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
|
virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void UpdateGradient();
|
|
||||||
|
|
||||||
QRectF expand_hitbox_;
|
QRectF expand_hitbox_;
|
||||||
|
|
||||||
Node* node_;
|
Node* node_;
|
||||||
|
|
||||||
QColor color_;
|
NodeViewItemWidgetProxy obj_proxy_;
|
||||||
|
|
||||||
QRectF title_bar_rect_;
|
QRectF title_bar_rect_;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user