Skip to content

Commit 72a0ba1

Browse files
stenzekstenzek
committed
FullscreenUI: Fix pause menu light theme shadow colour
1 parent aeadd4c commit 72a0ba1

3 files changed

Lines changed: 36 additions & 29 deletions

File tree

‎src/core/fullscreen_ui.cpp‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ using ImGuiFullscreen::CancelPendingMenuClose;
103103
using ImGuiFullscreen::CenterImage;
104104
using ImGuiFullscreen::DarkerColor;
105105
using ImGuiFullscreen::DefaultActiveButton;
106-
using ImGuiFullscreen::DrawShadowedText;
107106
using ImGuiFullscreen::EndFixedPopupModal;
108107
using ImGuiFullscreen::EndFullscreenColumns;
109108
using ImGuiFullscreen::EndFullscreenColumnWindow;
@@ -6433,29 +6432,33 @@ void FullscreenUI::DrawPauseMenu()
64336432
buffer.assign(Path::GetFileName(s_state.current_game_path));
64346433

64356434
ImVec2 text_pos = ImVec2(scaled_top_bar_padding + image_size + scaled_top_bar_padding, scaled_top_bar_padding);
6436-
DrawShadowedText(dl, UIStyle.LargeFont, text_pos, title_text_color, s_state.current_game_title.c_str(),
6437-
s_state.current_game_title.c_str() + s_state.current_game_title.size());
6435+
RenderShadowedTextClipped(dl, UIStyle.LargeFont, text_pos, display_size, title_text_color,
6436+
s_state.current_game_title.c_str(),
6437+
s_state.current_game_title.c_str() + s_state.current_game_title.size());
64386438
text_pos.y += UIStyle.LargeFont->FontSize + scaled_text_spacing;
64396439

64406440
if (Achievements::IsActive())
64416441
{
64426442
const auto lock = Achievements::GetLock();
64436443
if (const std::string& rp = Achievements::GetRichPresenceString(); !rp.empty())
64446444
{
6445-
DrawShadowedText(dl, UIStyle.MediumFont, text_pos, title_text_color, rp.data(), rp.data() + rp.length());
6445+
RenderShadowedTextClipped(dl, UIStyle.MediumFont, text_pos, display_size, title_text_color, rp.data(),
6446+
rp.data() + rp.length());
64466447
text_pos.y += UIStyle.MediumFont->FontSize + scaled_text_spacing;
64476448
}
64486449
}
64496450

6450-
DrawShadowedText(dl, UIStyle.MediumFont, text_pos, text_color, buffer.c_str(), buffer.end_ptr());
6451+
RenderShadowedTextClipped(dl, UIStyle.MediumFont, text_pos, display_size, text_color, buffer.c_str(),
6452+
buffer.end_ptr());
64516453

64526454
// current time / play time
64536455
buffer.format("{:%X}", fmt::localtime(std::time(nullptr)));
64546456

64556457
ImVec2 text_size = UIStyle.LargeFont->CalcTextSizeA(UIStyle.LargeFont->FontSize, std::numeric_limits<float>::max(),
64566458
-1.0f, buffer.c_str(), buffer.end_ptr());
64576459
text_pos = ImVec2(display_size.x - scaled_top_bar_padding - text_size.x, scaled_top_bar_padding);
6458-
DrawShadowedText(dl, UIStyle.LargeFont, text_pos, title_text_color, buffer.c_str(), buffer.end_ptr());
6460+
RenderShadowedTextClipped(dl, UIStyle.LargeFont, text_pos, display_size, title_text_color, buffer.c_str(),
6461+
buffer.end_ptr());
64596462
text_pos.y += UIStyle.LargeFont->FontSize + scaled_text_spacing;
64606463

64616464
if (!s_state.current_game_serial.empty())
@@ -6467,14 +6470,16 @@ void FullscreenUI::DrawPauseMenu()
64676470
text_size = ImVec2(UIStyle.MediumFont->CalcTextSizeA(
64686471
UIStyle.MediumFont->FontSize, std::numeric_limits<float>::max(), -1.0f, buffer.c_str(), buffer.end_ptr()));
64696472
text_pos.x = display_size.x - scaled_top_bar_padding - text_size.x;
6470-
DrawShadowedText(dl, UIStyle.MediumFont, text_pos, text_color, buffer.c_str(), buffer.end_ptr());
6473+
RenderShadowedTextClipped(dl, UIStyle.MediumFont, text_pos, display_size, text_color, buffer.c_str(),
6474+
buffer.end_ptr());
64716475
text_pos.y += UIStyle.MediumFont->FontSize + scaled_text_spacing;
64726476

64736477
buffer.format(FSUI_FSTR("All Time: {}"), GameList::FormatTimespan(cached_played_time + session_time, true));
64746478
text_size = ImVec2(UIStyle.MediumFont->CalcTextSizeA(
64756479
UIStyle.MediumFont->FontSize, std::numeric_limits<float>::max(), -1.0f, buffer.c_str(), buffer.end_ptr()));
64766480
text_pos.x = display_size.x - scaled_top_bar_padding - text_size.x;
6477-
DrawShadowedText(dl, UIStyle.MediumFont, text_pos, text_color, buffer.c_str(), buffer.end_ptr());
6481+
RenderShadowedTextClipped(dl, UIStyle.MediumFont, text_pos, display_size, text_color, buffer.c_str(),
6482+
buffer.end_ptr());
64786483
text_pos.y += UIStyle.MediumFont->FontSize + scaled_text_spacing;
64796484
}
64806485
}

‎src/util/imgui_fullscreen.cpp‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,9 +1297,9 @@ void ImGuiFullscreen::ResetMenuButtonFrame()
12971297
s_state.has_hovered_menu_item = false;
12981298
}
12991299

1300-
void ImGuiFullscreen::RenderShadowedTextClipped(ImFont* font, const ImVec2& pos_min, const ImVec2& pos_max, u32 color,
1301-
const char* text, const char* text_end,
1302-
const ImVec2* text_size_if_known /* = nullptr */,
1300+
void ImGuiFullscreen::RenderShadowedTextClipped(ImDrawList* draw_list, ImFont* font, const ImVec2& pos_min,
1301+
const ImVec2& pos_max, u32 color, const char* text,
1302+
const char* text_end, const ImVec2* text_size_if_known /* = nullptr */,
13031303
const ImVec2& align /* = ImVec2(0, 0)*/, float wrap_width /* = 0.0f*/,
13041304
const ImRect* clip_rect /* = nullptr */)
13051305
{
@@ -1327,24 +1327,32 @@ void ImGuiFullscreen::RenderShadowedTextClipped(ImFont* font, const ImVec2& pos_
13271327
if (align.y > 0.0f)
13281328
pos.y = ImMax(pos.y, pos.y + (pos_max.y - pos.y - text_size.y) * align.y);
13291329

1330-
ImDrawList* const dl = ImGui::GetWindowDrawList();
1331-
13321330
// Render
13331331
if (need_clipping)
13341332
{
13351333
ImVec4 fine_clip_rect(clip_min->x, clip_min->y, clip_max->x, clip_max->y);
1336-
dl->AddText(font, font->FontSize, pos + LayoutScale(LAYOUT_SHADOW_OFFSET, LAYOUT_SHADOW_OFFSET),
1337-
UIStyle.ShadowColor, text, text_display_end, wrap_width, &fine_clip_rect);
1338-
dl->AddText(font, font->FontSize, pos, color, text, text_display_end, wrap_width, &fine_clip_rect);
1334+
draw_list->AddText(font, font->FontSize, pos + LayoutScale(LAYOUT_SHADOW_OFFSET, LAYOUT_SHADOW_OFFSET),
1335+
UIStyle.ShadowColor, text, text_display_end, wrap_width, &fine_clip_rect);
1336+
draw_list->AddText(font, font->FontSize, pos, color, text, text_display_end, wrap_width, &fine_clip_rect);
13391337
}
13401338
else
13411339
{
1342-
dl->AddText(font, font->FontSize, pos + LayoutScale(LAYOUT_SHADOW_OFFSET, LAYOUT_SHADOW_OFFSET),
1343-
UIStyle.ShadowColor, text, text_display_end, wrap_width, nullptr);
1344-
dl->AddText(font, font->FontSize, pos, color, text, text_display_end, wrap_width, nullptr);
1340+
draw_list->AddText(font, font->FontSize, pos + LayoutScale(LAYOUT_SHADOW_OFFSET, LAYOUT_SHADOW_OFFSET),
1341+
UIStyle.ShadowColor, text, text_display_end, wrap_width, nullptr);
1342+
draw_list->AddText(font, font->FontSize, pos, color, text, text_display_end, wrap_width, nullptr);
13451343
}
13461344
}
13471345

1346+
void ImGuiFullscreen::RenderShadowedTextClipped(ImFont* font, const ImVec2& pos_min, const ImVec2& pos_max, u32 color,
1347+
const char* text, const char* text_end,
1348+
const ImVec2* text_size_if_known /* = nullptr */,
1349+
const ImVec2& align /* = ImVec2(0, 0)*/, float wrap_width /* = 0.0f*/,
1350+
const ImRect* clip_rect /* = nullptr */)
1351+
{
1352+
RenderShadowedTextClipped(ImGui::GetWindowDrawList(), font, pos_min, pos_max, color, text, text_end,
1353+
text_size_if_known, align, wrap_width, clip_rect);
1354+
}
1355+
13481356
void ImGuiFullscreen::MenuHeading(const char* title, bool draw_line /*= true*/)
13491357
{
13501358
const float line_thickness = draw_line ? LayoutScale(1.0f) : 0.0f;
@@ -1949,13 +1957,6 @@ bool ImGuiFullscreen::EnumChoiceButtonImpl(const char* title, const char* summar
19491957
return changed;
19501958
}
19511959

1952-
void ImGuiFullscreen::DrawShadowedText(ImDrawList* dl, ImFont* font, const ImVec2& pos, u32 col, const char* text,
1953-
const char* text_end /*= nullptr*/, float wrap_width /*= 0.0f*/)
1954-
{
1955-
dl->AddText(font, font->FontSize, pos + LayoutScale(1.0f, 1.0f), IM_COL32(0, 0, 0, 100), text, text_end, wrap_width);
1956-
dl->AddText(font, font->FontSize, pos, col, text, text_end, wrap_width);
1957-
}
1958-
19591960
void ImGuiFullscreen::BeginNavBar(float x_padding /*= LAYOUT_MENU_BUTTON_X_PADDING*/,
19601961
float y_padding /*= LAYOUT_MENU_BUTTON_Y_PADDING*/)
19611962
{

‎src/util/imgui_fullscreen.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,10 @@ void RenderShadowedTextClipped(ImFont* font, const ImVec2& pos_min, const ImVec2
243243
const char* text_end, const ImVec2* text_size_if_known = nullptr,
244244
const ImVec2& align = ImVec2(0, 0), float wrap_width = 0.0f,
245245
const ImRect* clip_rect = nullptr);
246+
void RenderShadowedTextClipped(ImDrawList* draw_list, ImFont* font, const ImVec2& pos_min, const ImVec2& pos_max,
247+
u32 color, const char* text, const char* text_end,
248+
const ImVec2* text_size_if_known = nullptr, const ImVec2& align = ImVec2(0, 0),
249+
float wrap_width = 0.0f, const ImRect* clip_rect = nullptr);
246250
void MenuHeading(const char* title, bool draw_line = true);
247251
bool MenuHeadingButton(const char* title, const char* value = nullptr, bool enabled = true, bool draw_line = true);
248252
bool ActiveButton(const char* title, bool is_active, bool enabled = true,
@@ -308,9 +312,6 @@ ALWAYS_INLINE static bool EnumChoiceButton(const char* title, const char* summar
308312
}
309313
}
310314

311-
void DrawShadowedText(ImDrawList* dl, ImFont* font, const ImVec2& pos, u32 col, const char* text,
312-
const char* text_end = nullptr, float wrap_width = 0.0f);
313-
314315
void BeginNavBar(float x_padding = LAYOUT_MENU_BUTTON_X_PADDING, float y_padding = LAYOUT_MENU_BUTTON_Y_PADDING);
315316
void EndNavBar();
316317
void NavTitle(const char* title, float height = LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, ImFont* font = UIStyle.LargeFont);

0 commit comments

Comments
 (0)