feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Extend SVG paste color parsing

Browse Source 
Extend the SVG paste color parsing to support the following values
rgb(255,255,255) and rgba(255,255,255,1.0).

Task-number: QDS-13508
Change-Id: Id7750617b45a94b1541f5a40f31d610de56dbaee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2024-09-04 11:41:37 +02:00
committed by Henning Gründl
parent 4e913b3d37
commit fd4214205e
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/components/componentcore/svgpasteaction.cpp
View File

@@ -814,8 +814,29 @@ QVariant convertValue(const QByteArray &key, const QString &value)
return value.toInt(); return value.toInt();
} else if (key == "opacity") { } else if (key == "opacity") {
return value.toFloat(); return value.toFloat();
} else if ((key == "fillColor" || key == "strokeColor") && value == "none") { } else if ((key == "fillColor" || key == "strokeColor")) {
return "transparent"; if (value == "none")
return QColor(0, 0, 0, 0);
static const QRegularExpression reRGB(
R"(^rgb\((?<red>\d{1,3}),\s*(?<green>\d{1,3}),\s*(?<blue>\d{1,3})\)$)");
QRegularExpressionMatch match = reRGB.match(value);
if (match.hasMatch()) {
return QColor(match.captured("red").toInt(),
match.captured("green").toInt(),
match.captured("blue").toInt());
}
static const QRegularExpression reRGBA(
R"(^rgba\((?<red>\d{1,3}),\s*(?<green>\d{1,3}),\s*(?<blue>\d{1,3}),\s*(?<alpha>\d*(?:\.\d+))\)$)");
match = reRGBA.match(value);
if (match.hasMatch()) {
QColor color(match.captured("red").toInt(),
match.captured("green").toInt(),
match.captured("blue").toInt());
color.setAlphaF(match.captured("alpha").toFloat());
return color;
}
} }
return value; return value;