From 8e8215d360bf2e57dbc96bb94428914f81bfa504 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Tue, 24 Jan 2023 01:08:20 +0200 Subject: [PATCH] theme: Replace LV_DPX with a constexpr variant --- src/displayapp/InfiniTimeTheme.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/displayapp/InfiniTimeTheme.cpp b/src/displayapp/InfiniTimeTheme.cpp index 2532f21d..6795647e 100644 --- a/src/displayapp/InfiniTimeTheme.cpp +++ b/src/displayapp/InfiniTimeTheme.cpp @@ -1,4 +1,17 @@ #include "displayapp/InfiniTimeTheme.h" +#include + +// Replace LV_DPX with a constexpr version using a constant LV_DPI +#undef LV_DPX + +namespace { + constexpr int LV_DPX(int n) { + if (n == 0) { + return 0; + } + return std::max(((LV_DPI * n + 80) / 160), 1); /*+80 for rounding*/ + } +} static void theme_apply(lv_obj_t* obj, lv_theme_style_t name);