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

Show color previews for QML functions

Browse Source 
Task-number: QTCREATORBUG-29966
Change-Id: I41aa37bdc446d2b238a6a9ec0f3bd73b3fae550a
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Xavier BESSON
2023-12-13 10:06:52 +01:00
committed by Xavier BESSON (Personal)
parent ed1b6b958a
commit df9b802842
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/texteditor/colorpreviewhoverhandler.cpp
View File

@@ -210,6 +210,7 @@ static QColor::Spec specForFunc(const QString &func)
if ((func == QLatin1String("QColor")) if ((func == QLatin1String("QColor"))
|| (func == QLatin1String("QRgb")) || (func == QLatin1String("QRgb"))
|| (func == QLatin1String("rgb")) || (func == QLatin1String("rgb"))
|| (func == QLatin1String("rgba"))
|| func.startsWith(QLatin1String("setRgb")) || func.startsWith(QLatin1String("setRgb"))
|| func.startsWith(QLatin1String("setRgba"))){ || func.startsWith(QLatin1String("setRgba"))){
return QColor::Rgb; return QColor::Rgb;
@@ -218,11 +219,15 @@ static QColor::Spec specForFunc(const QString &func)
if (func.startsWith(QLatin1String("setCmyk"))) if (func.startsWith(QLatin1String("setCmyk")))
return QColor::Cmyk; return QColor::Cmyk;
if (func.startsWith(QLatin1String("setHsv"))) if (func.startsWith(QLatin1String("hsva"))
|| func.startsWith(QLatin1String("setHsv"))) {
return QColor::Hsv; return QColor::Hsv;
}
if (func.startsWith(QLatin1String("setHsl"))) if (func.startsWith(QLatin1String("hsla"))
|| func.startsWith(QLatin1String("setHsl"))) {
return QColor::Hsv; return QColor::Hsv;
}
return QColor::Invalid; return QColor::Invalid;
} }
@@ -311,6 +316,9 @@ static QColor colorFromFuncAndArgs(const QString &func, const QStringList &args)
if (func == QLatin1String("setNamedColor")) if (func == QLatin1String("setNamedColor"))
return QColor(arg0); return QColor(arg0);
if (func == QLatin1String("color"))
return QColor(arg0);
if (arg0.startsWith(QLatin1Char('#'))) if (arg0.startsWith(QLatin1Char('#')))
return QColor(arg0); return QColor(arg0);
@@ -326,7 +334,7 @@ static QColor colorFromFuncAndArgs(const QString &func, const QStringList &args)
if (spec == QColor::Invalid) if (spec == QColor::Invalid)
return QColor(); return QColor();
if (func.endsWith(QLatin1Char('F'))) if (func.endsWith(QLatin1Char('F')) || func == QLatin1String("rgba"))
return colorFromArgsF(args, spec); return colorFromArgsF(args, spec);
return colorFromArgs(args, spec); return colorFromArgs(args, spec);