From aab63e82ae970861934b75347ce02aa4d3240bb5 Mon Sep 17 00:00:00 2001 From: iota97 Date: Thu, 12 Aug 2021 11:36:14 +0200 Subject: [PATCH] Fix layout opacity --- UI/TouchControlLayoutScreen.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 3f040f5ae3..91a304ca25 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -99,10 +99,8 @@ public: } void Draw(UIContext &dc) override { - float opacity = g_Config.iTouchButtonOpacity / 100.0f; - - uint32_t colorBg = colorAlpha(GetButtonColor(), opacity); - uint32_t color = colorAlpha(0xFFFFFF, opacity); + uint32_t colorBg = colorAlpha(GetButtonColor(), GetButtonOpacity()); + uint32_t color = colorAlpha(0xFFFFFF, GetButtonOpacity()); int centerX = bounds_.centerX(); int centerY = bounds_.centerY(); @@ -160,10 +158,8 @@ public: } void Draw(UIContext &dc) override { - float opacity = g_Config.iTouchButtonOpacity / 100.0f; - - uint32_t colorBg = colorAlpha(GetButtonColor(), opacity); - uint32_t color = colorAlpha(0xFFFFFF, opacity); + uint32_t colorBg = colorAlpha(GetButtonColor(), GetButtonOpacity()); + uint32_t color = colorAlpha(0xFFFFFF, GetButtonOpacity()); static const float xoff[4] = {1, 0, -1, 0}; static const float yoff[4] = {0, 1, 0, -1};