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

Revert "Merge pull request #4286 from shuffle2/Aestek-clean-osd"

Browse Source 
This reverts commit 5c0fa4db4f, reversing
changes made to b8731eb818.
This commit is contained in:
degasus
2016-10-15 12:36:11 +02:00
parent b8a1611f4a
commit 1cc1876002
7 changed files with 146 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,24 +21,18 @@ static std::multimap<CallbackType, Callback> s_callbacks;
static std::multimap<MessageType, Message> s_messages;
static std::mutex s_messages_mutex;
static std::string CleanMessage(std::string message)
{
std::replace_if(message.begin(), message.end(), [](char c) { return !std::isprint(c); }, '?');
return message;
}
void AddTypedMessage(MessageType type, const std::string& message, u32 ms, u32 rgba)
{
std::lock_guard<std::mutex> lock(s_messages_mutex);
s_messages.erase(type);
s_messages.emplace(type, Message(CleanMessage(message), Common::Timer::GetTimeMs() + ms, rgba));
s_messages.emplace(type, Message(message, Common::Timer::GetTimeMs() + ms, rgba));
}
void AddMessage(const std::string& message, u32 ms, u32 rgba)
{
std::lock_guard<std::mutex> lock(s_messages_mutex);
s_messages.emplace(MessageType::Typeless,
Message(CleanMessage(message), Common::Timer::GetTimeMs() + ms, rgba));
Message(message, Common::Timer::GetTimeMs() + ms, rgba));
}
void DrawMessage(const Message& msg, int top, int left, int time_left)
@ -58,7 +52,7 @@ void DrawMessages()
std::lock_guard<std::mutex> lock(s_messages_mutex);
u32 now = Common::Timer::GetTimeMs();
int left = 20, top = 20;
int left = 20, top = 35;
auto it = s_messages.begin();
while (it != s_messages.end())