piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9075 from JosJuice/android-osd-left-margin

Browse Source 
Android: Move OSD out of the way when menu is open
This commit is contained in:
JMC47
2020-09-16 16:42:04 -04:00
committed by GitHub
parent 097a4f4ecf 161f99b864
commit 6ada03fca2
5 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Core/VideoCommon/OnScreenDisplay.cpp
View File

@ -5,6 +5,7 @@
#include "VideoCommon/OnScreenDisplay.h"
#include <algorithm>
#include <atomic>
#include <map>
#include <mutex>
#include <string>
@ -24,6 +25,9 @@ constexpr float LEFT_MARGIN = 10.0f; // Pixels to the left of OSD messages.
constexpr float TOP_MARGIN = 10.0f; // Pixels above the first OSD message.
constexpr float WINDOW_PADDING = 4.0f; // Pixels between subsequent OSD messages.
static std::atomic<int> s_obscured_pixels_left = 0;
static std::atomic<int> s_obscured_pixels_top = 0;
struct Message
{
Message() = default;
@ -97,8 +101,9 @@ void DrawMessages()
{
const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES);
const u32 now = Common::Timer::GetTimeMs();
const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x;
float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y;
const float current_x =
LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x + s_obscured_pixels_left;
float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y + s_obscured_pixels_top;
int index = 0;
std::lock_guard lock{s_messages_mutex};
@ -128,4 +133,15 @@ void ClearMessages()
std::lock_guard lock{s_messages_mutex};
s_messages.clear();
}
void SetObscuredPixelsLeft(int width)
{
s_obscured_pixels_left = width;
}
void SetObscuredPixelsTop(int height)
{
s_obscured_pixels_top = height;
}
} // namespace OSD

3
Source/Core/VideoCommon/OnScreenDisplay.h
View File

@ -44,4 +44,7 @@ void AddTypedMessage(MessageType type, std::string message, u32 ms = Duration::S
// Draw the current messages on the screen. Only call once per frame.
void DrawMessages();
void ClearMessages();
void SetObscuredPixelsLeft(int width);
void SetObscuredPixelsTop(int height);
} // namespace OSD