From 6d93ca0f42d2151f3c04521e4750056aa80c00e5 Mon Sep 17 00:00:00 2001 From: misygauziya Date: Thu, 25 Apr 2024 11:05:53 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B[bugfix]=20Model=20:=20overlay?= =?UTF-8?q?=E3=81=AE=E4=B8=8D=E9=80=8F=E6=98=8E=E5=BA=A6=E3=81=8C=E8=BF=BD?= =?UTF-8?q?=E5=BE=93=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=81=AE?= =?UTF-8?q?=E5=AF=BE=E7=AD=962?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model.py | 1 - models/overlay/overlay.py | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/model.py b/model.py index 3bd30e69..6aa6f6c4 100644 --- a/model.py +++ b/model.py @@ -623,7 +623,6 @@ class Model: if self.overlay.initialized is True: opacity = config.OVERLAY_SETTINGS["opacity"] self.overlay.uiManager.setTransparency(opacity) - self.overlay.uiManager.update() def updateOverlayImageUiScaling(self): if self.overlay.initialized is True: diff --git a/models/overlay/overlay.py b/models/overlay/overlay.py index 8235f57f..6091bc5f 100644 --- a/models/overlay/overlay.py +++ b/models/overlay/overlay.py @@ -98,6 +98,7 @@ class UIManager: overlay_name, self.settings, ) + self.fadeRatio = 1 self.lastUpdate = time.monotonic() def update(self): @@ -113,11 +114,11 @@ class UIManager: def evaluateTransparencyFade(self, lastUpdate, currentTime): if (currentTime - lastUpdate) > self.settings['Fade_time']: timeThroughInterval = currentTime - lastUpdate - self.settings['Fade_time'] - fadeRatio = 1 - timeThroughInterval / self.settings['Fade_interval'] - if fadeRatio < 0: - fadeRatio = 0 + self.fadeRatio = 1 - timeThroughInterval / self.settings['Fade_interval'] + if self.fadeRatio < 0: + self.fadeRatio = 0 - self.overlayUI.setTransparency(fadeRatio * self.settings['Transparency']) + self.overlayUI.setTransparency(self.fadeRatio * self.settings['Transparency']) def posUpdate(self): self.overlayUI.updatePosition() @@ -139,6 +140,7 @@ class UIManager: def setTransparency(self, transparency): self.settings["Transparency"] = transparency + self.overlayUI.setTransparency(self.fadeRatio * self.settings['Transparency']) class Overlay: def __init__(self, x, y , depth, fade_time, fade_interval, transparency, ui_scaling):