mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-04-24 14:24:54 +00:00
Merge 6b23465e91
into 879a8889aa
This commit is contained in:
commit
68af2ad61a
1 changed files with 2 additions and 3 deletions
|
@ -35,11 +35,10 @@ void NetPlayChatUI::Display()
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::BeginChild("Scrolling", ImVec2(0, -30 * scale), true, ImGuiWindowFlags_None);
|
ImGui::BeginChild("Scrolling", ImVec2(0, -30 * scale), true, ImGuiWindowFlags_None);
|
||||||
for (const auto& msg : m_messages)
|
for (const auto& [text, color] : m_messages)
|
||||||
{
|
{
|
||||||
auto c = msg.second;
|
|
||||||
ImGui::PushTextWrapPos(0.0f);
|
ImGui::PushTextWrapPos(0.0f);
|
||||||
ImGui::TextColored(ImVec4(c[0], c[1], c[2], 1.0f), "%s", msg.first.c_str());
|
ImGui::TextColored(ImVec4(color[0], color[1], color[2], 1.0f), "%s", text.c_str());
|
||||||
ImGui::PopTextWrapPos();
|
ImGui::PopTextWrapPos();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue