mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-10-29 15:36:08 +00:00
Code Issues Releases Wiki Activity

Removed anim::cvalue and ColorAnimation, all done by fvalue now.

Browse Source 
Also moved style::interpolate to anim::color/anim::pen/anim::brush.
This commit is contained in:
John Preston
2016-11-07 14:24:19 +03:00
parent 0326976473
commit 23c2e5364a
55 changed files with 483 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Telegram/SourceFiles/codegen/style/parsed_file.cpp
View File

@@ -120,7 +120,6 @@ std::string logType(const structure::Type &type) {
{ structure::TypeTag::Color , "color" },
{ structure::TypeTag::Point , "point" },
{ structure::TypeTag::Size , "size" },
{ structure::TypeTag::Transition, "transition" },
{ structure::TypeTag::Cursor , "cursor" },
{ structure::TypeTag::Align , "align" },
{ structure::TypeTag::Margins , "margins" },
@@ -138,10 +137,6 @@ bool validateAnsiString(const QString &value) {
return true;
}
bool validateTransitionString(const QString &value) {
return QRegularExpression("^[a-zA-Z_]+$").match(value).hasMatch();
}
bool validateCursorString(const QString &value) {
return QRegularExpression("^[a-z_]+$").match(value).hasMatch();
}
@@ -313,8 +308,6 @@ structure::Value ParsedFile::readValue() {
return pointValue;
} else if (auto sizeValue = readSizeValue()) {
return sizeValue;
} else if (auto transitionValue = readTransitionValue()) {
return transitionValue;
} else if (auto cursorValue = readCursorValue()) {
return cursorValue;
} else if (auto alignValue = readAlignValue()) {
@@ -606,26 +599,6 @@ structure::Value ParsedFile::readSizeValue() {
return {};
}
structure::Value ParsedFile::readTransitionValue() {
if (auto font = file_.getToken(BasicType::Name)) {
if (tokenValue(font) == "transition") {
assertNextToken(BasicType::LeftParenthesis);
auto transition = tokenValue(assertNextToken(BasicType::Name));
assertNextToken(BasicType::RightParenthesis);
if (validateTransitionString(transition)) {
return { structure::TypeTag::Transition, transition.toStdString() };
} else {
logError(kErrorBadString) << "bad transition value";
}
}
file_.putBack();
}
return {};
}
structure::Value ParsedFile::readCursorValue() {
if (auto font = file_.getToken(BasicType::Name)) {
if (tokenValue(font) == "cursor") {