history-museum/winamp
1
0
Fork 0
mirror of https://github.com/WinampDesktop/winamp.git synced 2025-06-14 21:45:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

FullscreenUI: Fix gaps between some UI elements

Browse Source 
By rounding sizes up to the nearest pixel.
This commit is contained in:
Stenzek
2024-04-16 13:38:58 +10:00
parent d2d6e397e6
commit 4d8ed49b24
4 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/fullscreen_ui.cpp
View File

@ -117,7 +117,6 @@ using ImGuiFullscreen::BeginNavBar;
using ImGuiFullscreen::CenterImage;
using ImGuiFullscreen::CloseChoiceDialog;
using ImGuiFullscreen::CloseFileSelector;
using ImGuiFullscreen::DPIScale;
using ImGuiFullscreen::DrawShadowedText;
using ImGuiFullscreen::EndFullscreenColumns;
using ImGuiFullscreen::EndFullscreenColumnWindow;

43
src/util/imgui_fullscreen.h
View File

@ -67,63 +67,32 @@ extern ImVec4 UISecondaryWeakColor; // Not currently used.
extern ImVec4 UISecondaryStrongColor;
extern ImVec4 UISecondaryTextColor;
ALWAYS_INLINE static float DPIScale(float v)
{
return ImGui::GetIO().DisplayFramebufferScale.x * v;
}
ALWAYS_INLINE static float DPIScale(int v)
{
return ImGui::GetIO().DisplayFramebufferScale.x * static_cast<float>(v);
}
ALWAYS_INLINE static ImVec2 DPIScale(const ImVec2& v)
{
const ImVec2& fbs = ImGui::GetIO().DisplayFramebufferScale;
return ImVec2(v.x * fbs.x, v.y * fbs.y);
}
ALWAYS_INLINE static float WindowWidthScale(float v)
{
return ImGui::GetWindowWidth() * v;
}
ALWAYS_INLINE static float WindowHeightScale(float v)
{
return ImGui::GetWindowHeight() * v;
}
ALWAYS_INLINE static float LayoutScale(float v)
{
return g_layout_scale * v;
return ImCeil(g_layout_scale * v);
}
ALWAYS_INLINE static ImVec2 LayoutScale(const ImVec2& v)
{
return ImVec2(v.x * g_layout_scale, v.y * g_layout_scale);
return ImVec2(ImCeil(v.x * g_layout_scale), ImCeil(v.y * g_layout_scale));
}
ALWAYS_INLINE static ImVec2 LayoutScale(float x, float y)
{
return ImVec2(x * g_layout_scale, y * g_layout_scale);
}
ALWAYS_INLINE static ImVec2 LayoutScaleAndOffset(float x, float y)
{
return ImVec2(g_layout_padding_left + x * g_layout_scale, g_layout_padding_top + y * g_layout_scale);
return ImVec2(ImCeil(x * g_layout_scale), ImCeil(y * g_layout_scale));
}
ALWAYS_INLINE static float LayoutUnscale(float v)
{
return g_rcp_layout_scale * v;
return ImCeil(g_rcp_layout_scale * v);
}
ALWAYS_INLINE static ImVec2 LayoutUnscale(const ImVec2& v)
{
return ImVec2(v.x * g_rcp_layout_scale, v.y * g_rcp_layout_scale);
return ImVec2(ImCeil(v.x * g_rcp_layout_scale), ImCeil(v.y * g_rcp_layout_scale));
}
ALWAYS_INLINE static ImVec2 LayoutUnscale(float x, float y)
{
return ImVec2(x * g_rcp_layout_scale, y * g_rcp_layout_scale);
return ImVec2(ImCeil(x * g_rcp_layout_scale), ImCeil(y * g_rcp_layout_scale));
}
ALWAYS_INLINE static ImVec4 ModAlpha(const ImVec4& v, float a)

4
src/util/imgui_manager.cpp
View File

@ -631,12 +631,12 @@ bool ImGuiManager::AddImGuiFonts(bool fullscreen_fonts)
if (fullscreen_fonts)
{
const float medium_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_MEDIUM_FONT_SIZE));
const float medium_font_size = ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_MEDIUM_FONT_SIZE);
s_medium_font = AddTextFont(medium_font_size);
if (!s_medium_font || !AddIconFonts(medium_font_size))
return false;
const float large_font_size = std::ceil(ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_LARGE_FONT_SIZE));
const float large_font_size = ImGuiFullscreen::LayoutScale(ImGuiFullscreen::LAYOUT_LARGE_FONT_SIZE);
s_large_font = AddTextFont(large_font_size);
if (!s_large_font || !AddIconFonts(large_font_size))
return false;