From 6e0455ef78ff797dbce4c64def3b063d48beedc0 Mon Sep 17 00:00:00 2001 From: misyaguziya <53165965+misyaguziya@users.noreply.github.com> Date: Wed, 27 Nov 2024 22:47:12 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=8D=EF=B8=8F[Update]=20Model=20:=20Ove?= =?UTF-8?q?rlay=E3=81=AE=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=AB=E3=81=8C?= =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=97=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-python/model.py | 9 ++++++--- src-python/models/overlay/overlay.py | 5 +---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src-python/model.py b/src-python/model.py index ab7ca815..23621e92 100644 --- a/src-python/model.py +++ b/src-python/model.py @@ -82,9 +82,12 @@ class Model: self.previous_receive_message = "" self.translator = Translator() self.keyword_processor = KeywordProcessor() + overlay_small_log_settings = copy.deepcopy(config.OVERLAY_SMALL_LOG_SETTINGS) + overlay_large_log_settings = copy.deepcopy(config.OVERLAY_LARGE_LOG_SETTINGS) + overlay_large_log_settings["ui_scaling"] = overlay_large_log_settings["ui_scaling"] * 0.25 overlay_settings = { - "small": config.OVERLAY_SMALL_LOG_SETTINGS, - "large": config.OVERLAY_LARGE_LOG_SETTINGS, + "small": overlay_small_log_settings, + "large": overlay_large_log_settings, } self.overlay = Overlay(overlay_settings) self.overlay_image = OverlayImage() @@ -746,7 +749,7 @@ class Model: self.overlay.updateDisplayDuration(config.OVERLAY_LARGE_LOG_SETTINGS["display_duration"], size) self.overlay.updateFadeoutDuration(config.OVERLAY_LARGE_LOG_SETTINGS["fadeout_duration"], size) self.overlay.updateOpacity(config.OVERLAY_LARGE_LOG_SETTINGS["opacity"], size, True) - self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"], size) + self.overlay.updateUiScaling(config.OVERLAY_LARGE_LOG_SETTINGS["ui_scaling"] * 0.25, size) def startOverlay(self): self.overlay.startOverlay() diff --git a/src-python/models/overlay/overlay.py b/src-python/models/overlay/overlay.py index 4cc20e30..8f7bbe6f 100644 --- a/src-python/models/overlay/overlay.py +++ b/src-python/models/overlay/overlay.py @@ -160,10 +160,7 @@ class Overlay: def updateUiScaling(self, ui_scaling, size): self.settings[size]["ui_scaling"] = ui_scaling if self.initialized is True: - if size == "large": - self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]*0.25) - else: - self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]) + self.overlay.setOverlayWidthInMeters(self.handle[size], self.settings[size]["ui_scaling"]) def updatePosition(self, x_pos, y_pos, z_pos, x_rotation, y_rotation, z_rotation, tracker, size): """