From 3202cc70212a952e9d41c4fd0bc61a725f056c90 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sat, 28 Jan 2023 22:29:10 +0100 Subject: [PATCH] overlays/osk: fix y offset direction facepalm --- rpcs3/Emu/RSX/Overlays/overlay_osk.cpp | 2 +- rpcs3/Emu/RSX/Overlays/overlays.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp index e286d4f05f..09868eb1b9 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp @@ -379,7 +379,7 @@ namespace rsx const auto get_y = [](const osk_window_layout& layout, const u16& height) -> f32 { constexpr f32 origin_y = virtual_height / 2.0f; - const f32 y = origin_y + layout.y_offset; + const f32 y = origin_y - layout.y_offset; // Negative because we increase y towards the bottom and cellOsk increases y towards the top. switch (layout.y_align) { diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index d8aad90f5d..3f11742ca6 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -30,8 +30,8 @@ namespace rsx u32 uid = umax; u32 type_index = umax; - static const u16 virtual_width = 1280; - static const u16 virtual_height = 720; + static constexpr u16 virtual_width = 1280; + static constexpr u16 virtual_height = 720; u32 min_refresh_duration_us = 16600; atomic_t visible = false;