oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revised text node

Browse Source 
Fixes #1684
This commit is contained in:
itsmattkc
2021-10-25 15:46:06 -07:00
parent 6543512d00
commit dc79a6a5d9
16 changed files with 351 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/colorwheel/colorgradientwidget.cpp
+2 -2
View File
@@ -76,7 +76,7 @@ void ColorGradientWidget::paintEvent(QPaintEvent *e)
p.setPen(QPen(GetUISelectorColor(), qMax(1, selector_radius / 2)));
p.setBrush(Qt::NoBrush);
double clamped_val = clamp(val_, 0.0, 1.0);
float clamped_val = clamp(val_, 0.0f, 1.0f);
if (orientation_ == Qt::Horizontal) {
p.drawRect(qRound(width() * (1.0 - clamped_val)) - selector_radius, 0, selector_radius * 2, height() - 1);
@@ -87,7 +87,7 @@ void ColorGradientWidget::paintEvent(QPaintEvent *e)
void ColorGradientWidget::SelectedColorChangedEvent(const Color &c, bool external)
{
double hue, sat;
float hue, sat;
c.toHsv(&hue, &sat, &val_);
app/widget/colorwheel/colorgradientwidget.h
+1 -1
View File
@@ -50,7 +50,7 @@ private:
Color end_;
double val_;
float val_;
};
app/widget/colorwheel/colorwheelwidget.cpp
+2 -2
View File
@@ -121,7 +121,7 @@ void ColorWheelWidget::SelectedColorChangedEvent(const Color &c, bool external)
{
if (external) {
force_redraw_ = true;
val_ = clamp(c.value(), 0.0, 1.0);
val_ = clamp(c.value(), 0.0f, 1.0f);
}
}
@@ -159,7 +159,7 @@ Color ColorWheelWidget::GetColorFromTriangle(const ColorWheelWidget::Triangle &t
QPoint ColorWheelWidget::GetCoordsFromColor(const Color &c) const
{
double hue, sat, val;
float hue, sat, val;
c.toHsv(&hue, &sat, &val);
qreal hypotenuse = sat * GetRadius();
app/widget/timelinewidget/tool/add.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include "node/factory.h"
#include "node/generator/shape/shapenode.h"
#include "node/generator/solid/solid.h"
#include "node/generator/text/textlegacy.h"
#include "node/generator/text/text.h"
#include "widget/timelinewidget/timelinewidget.h"
#include "widget/timelinewidget/undo/timelineundopointer.h"
@@ -138,7 +138,7 @@ void AddTool::MouseRelease(TimelineViewMouseEvent *event)
break;
case olive::Tool::kAddableTitle:
{
node_to_add = new TextGeneratorLegacy();
node_to_add = new TextGenerator();
break;
}
case olive::Tool::kAddableBars: