ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ImGuiManager: Tweak OSD message size

This commit is contained in:
Stenzek 2024-08-26 14:41:58 +10:00
parent 7a05d5aca5
commit e54c4c8101
No known key found for this signature in database
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/imgui_overlays.cpp
View File

@ -116,10 +116,10 @@ void Host::DisplayLoadingScreen(const char* message, int progress_min /*= -1*/,
} }
ImGui::End(); ImGui::End();
const float padding_and_rounding = 15.0f * scale; const float padding_and_rounding = 18.0f * scale;
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding));
ImGui::SetNextWindowSize(ImVec2(width, (has_progress ? 80.0f : 50.0f) * scale), ImGuiCond_Always); ImGui::SetNextWindowSize(ImVec2(width, (has_progress ? 90.0f : 55.0f) * scale), ImGuiCond_Always);
ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, (io.DisplaySize.y * 0.5f) + (100.0f * scale)), ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x * 0.5f, (io.DisplaySize.y * 0.5f) + (100.0f * scale)),
ImGuiCond_Always, ImVec2(0.5f, 0.0f)); ImGuiCond_Always, ImVec2(0.5f, 0.0f));
if (ImGui::Begin("LoadingScreen", nullptr, if (ImGui::Begin("LoadingScreen", nullptr,
@ -976,10 +976,10 @@ void SaveStateSelectorUI::Draw()
const auto& io = ImGui::GetIO(); const auto& io = ImGui::GetIO();
const float scale = ImGuiManager::GetGlobalScale(); const float scale = ImGuiManager::GetGlobalScale();
const float width = (600.0f * scale); const float width = (640.0f * scale);
const float height = (420.0f * scale); const float height = (450.0f * scale);
const float padding_and_rounding = 15.0f * scale; const float padding_and_rounding = 18.0f * scale;
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding); ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, padding_and_rounding);
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding)); ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(padding_and_rounding, padding_and_rounding));
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.11f, 0.15f, 0.17f, 0.8f)); ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0.11f, 0.15f, 0.17f, 0.8f));
@ -993,7 +993,7 @@ void SaveStateSelectorUI::Draw()
{ {
// Leave 2 lines for the legend // Leave 2 lines for the legend
const float legend_margin = ImGui::GetFontSize() * 2.0f + ImGui::GetStyle().ItemSpacing.y * 3.0f; const float legend_margin = ImGui::GetFontSize() * 2.0f + ImGui::GetStyle().ItemSpacing.y * 3.0f;
const float padding = 10.0f * scale; const float padding = 12.0f * scale;
ImGui::BeginChild("##item_list", ImVec2(0, -legend_margin), false, ImGui::BeginChild("##item_list", ImVec2(0, -legend_margin), false,
ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoInputs | ImGuiWindowFlags_NoTitleBar |

13
src/util/imgui_manager.cpp
View File

@ -654,7 +654,8 @@ bool ImGuiManager::AddIconFonts(float size)
bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts) bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts)
{ {
const float standard_font_size = std::ceil(15.0f * s_global_scale); const float standard_font_size = std::ceil(18.0f * s_global_scale);
const float fixed_font_size = std::ceil(15.0f * s_global_scale);
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
io.Fonts->Clear(); io.Fonts->Clear();
@ -663,7 +664,7 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts)
if (!s_standard_font || !AddIconFonts(standard_font_size)) if (!s_standard_font || !AddIconFonts(standard_font_size))
return false; return false;
s_fixed_font = AddFixedFont(standard_font_size); s_fixed_font = AddFixedFont(fixed_font_size);
if (!s_fixed_font) if (!s_fixed_font)
return false; return false;
@ -838,10 +839,10 @@ void ImGuiManager::DrawOSDMessages(Common::Timer::Value current_time)
ImFont* const font = ImGui::GetFont(); ImFont* const font = ImGui::GetFont();
const float scale = s_global_scale; const float scale = s_global_scale;
const float spacing = std::ceil(5.0f * scale); const float spacing = std::ceil(6.0f * scale);
const float margin = std::ceil(10.0f * scale); const float margin = std::ceil(12.0f * scale);
const float padding = std::ceil(8.0f * scale); const float padding = std::ceil(10.0f * scale);
const float rounding = std::ceil(5.0f * scale); const float rounding = std::ceil(6.0f * scale);
const float max_width = s_window_width - (margin + padding) * 2.0f; const float max_width = s_window_width - (margin + padding) * 2.0f;
float position_x = margin; float position_x = margin;
float position_y = margin; float position_y = margin;