mirror of
https://github.com/RetroDECK/ES-DE.git
synced 2025-04-10 19:15:13 +00:00
Changed the horizontal_wheel and vertical_wheel carousel type property values to horizontalWheel and verticalWheel.
This commit is contained in:
parent
558e13d0c9
commit
ac662046d7
|
@ -1140,17 +1140,35 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||||
mLegacyMode = theme->isLegacyTheme();
|
mLegacyMode = theme->isLegacyTheme();
|
||||||
|
|
||||||
if (elem->has("type")) {
|
if (elem->has("type")) {
|
||||||
const std::string& type {elem->get<std::string>("type")};
|
std::string type {elem->get<std::string>("type")};
|
||||||
|
if (type == "horizontal_wheel") {
|
||||||
|
type = "horizontalWheel";
|
||||||
|
if (!mLegacyMode) {
|
||||||
|
LOG(LogWarning)
|
||||||
|
<< "CarouselComponent: Property value \"horizontal_wheel\" has been "
|
||||||
|
"deprecated and will be removed in a future release, use "
|
||||||
|
"\"horizontalWheel\" instead";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (type == "vertical_wheel") {
|
||||||
|
type = "verticalWheel";
|
||||||
|
if (!mLegacyMode) {
|
||||||
|
LOG(LogWarning) << "CarouselComponent: Property value \"vertical_wheel\" has been "
|
||||||
|
"deprecated and will be removed in a future release, use "
|
||||||
|
"\"verticalWheel\" instead";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (type == "horizontal") {
|
if (type == "horizontal") {
|
||||||
mType = CarouselType::HORIZONTAL;
|
mType = CarouselType::HORIZONTAL;
|
||||||
}
|
}
|
||||||
else if (type == "horizontal_wheel") {
|
else if (type == "horizontalWheel") {
|
||||||
mType = CarouselType::HORIZONTAL_WHEEL;
|
mType = CarouselType::HORIZONTAL_WHEEL;
|
||||||
}
|
}
|
||||||
else if (type == "vertical") {
|
else if (type == "vertical") {
|
||||||
mType = CarouselType::VERTICAL;
|
mType = CarouselType::VERTICAL;
|
||||||
}
|
}
|
||||||
else if (type == "vertical_wheel") {
|
else if (type == "verticalWheel") {
|
||||||
mType = CarouselType::VERTICAL_WHEEL;
|
mType = CarouselType::VERTICAL_WHEEL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -1239,8 +1257,8 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
|
||||||
"\"maxItemCount\" for element \""
|
"\"maxItemCount\" for element \""
|
||||||
<< element.substr(9) << "\" not applicable to the "
|
<< element.substr(9) << "\" not applicable to the "
|
||||||
<< (mType == CarouselType::HORIZONTAL_WHEEL ?
|
<< (mType == CarouselType::HORIZONTAL_WHEEL ?
|
||||||
"\"horizontal_wheel\"" :
|
"\"horizontalWheel\"" :
|
||||||
"\"vertical_wheel\"")
|
"\"verticalWheel\"")
|
||||||
<< " type";
|
<< " type";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue