From 1c82228a9c8dca73de60132ef19f8704b6ab6584 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 10 Oct 2022 20:52:55 +0200 Subject: [PATCH] Fixed two small logical errors. --- es-core/src/components/DateTimeComponent.cpp | 2 +- es-core/src/components/TextComponent.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es-core/src/components/DateTimeComponent.cpp b/es-core/src/components/DateTimeComponent.cpp index faa2537ce..d9bfb6de6 100644 --- a/es-core/src/components/DateTimeComponent.cpp +++ b/es-core/src/components/DateTimeComponent.cpp @@ -211,7 +211,7 @@ void DateTimeComponent::applyTheme(const std::shared_ptr& theme, float maxHeight {0.0f}; - if (!theme->isLegacyTheme() && properties & elem->has("size")) { + if (!theme->isLegacyTheme() && elem->has("size")) { const glm::vec2 size {elem->get("size")}; if (size.x != 0.0f && size.y != 0.0f) maxHeight = mSize.y * 2.0f; diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp index 2c13226cc..f0449230d 100644 --- a/es-core/src/components/TextComponent.cpp +++ b/es-core/src/components/TextComponent.cpp @@ -459,7 +459,7 @@ void TextComponent::applyTheme(const std::shared_ptr& theme, float maxHeight {0.0f}; - if (!theme->isLegacyTheme() && properties & elem->has("size")) { + if (!theme->isLegacyTheme() && elem->has("size")) { const glm::vec2 size {elem->get("size")}; if (size.x != 0.0f && size.y != 0.0f) maxHeight = mSize.y * 2.0f;