kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

App: Extend/change color API:

Browse Source 
* Also set/get alpha value in setValue/asValue
* Add new static method fromValue
This commit is contained in:
wmayer
2024-11-29 07:52:55 +01:00
committed by Chris Hennes
parent 598e32cdb3
commit e34fd72956
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App/Color.h
View File

@@ -32,6 +32,7 @@
#include <FCGlobal.h>
// NOLINTBEGIN(readability-magic-numbers)
namespace App
{
@@ -54,6 +55,10 @@ struct color_traits
{
return static_cast<float>(ct.blueF());
}
float alphaF() const
{
return static_cast<float>(ct.alphaF());
}
int red() const
{
return ct.red();
@@ -180,7 +185,7 @@ public:
void setValue(const T& q)
{
color_traits<T> ct {q};
set(ct.redF(), ct.greenF(), ct.blueF());
set(ct.redF(), ct.greenF(), ct.blueF(), ct.alphaF());
}
/**
* returns a template type e.g. Qt color equivalent to FC color
@@ -192,9 +197,19 @@ public:
// clang-format off
return color_traits<T>::makeColor(int(std::lround(r * 255.0F)),
int(std::lround(g * 255.0F)),
int(std::lround(b * 255.0F)));
int(std::lround(b * 255.0F)),
int(std::lround(a * 255.0F)));
// clang-format on
}
/**
* creates FC Color from template type, e.g. Qt QColor
*/
template<typename T>
static Color fromValue(const T& q)
{
color_traits<T> ct {q};
return Color(ct.redF(), ct.greenF(), ct.blueF(), ct.alphaF());
}
/**
* returns color as hex color "#RRGGBB"
*
@@ -212,5 +227,6 @@ public:
};
} // namespace App
// NOLINTEND(readability-magic-numbers)
#endif // APP_COLOR_H

2
src/Gui/TaskElementColors.cpp
View File

@@ -196,7 +196,7 @@ public:
auto item = ui->elementList->item(i);
auto col = item->data(Qt::UserRole).value<QColor>();
std::string sub = qPrintable(item->data(Qt::UserRole + 1).value<QString>());
info.emplace(sub, App::Color(col.redF(), col.greenF(), col.blueF(), col.alphaF()));
info.emplace(sub, App::Color::fromValue<QColor>(col));
}
if (!App::GetApplication().getActiveTransaction()) {
App::GetApplication().setActiveTransaction("Set colors");