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

FullscreenUI: Remove hardcoded sizes for menu items

Browse Source 
Make it dynamic based on content instead.
pull/3457/head
Stenzek 5 months ago
parent 9127198be7
commit 5063a49f2a
No known key found for this signature in database
4 changed files with 372 additions and 386 deletions
Show Stats Download Patch File Download Diff File

9
src/core/achievements.cpp
Unescape Escape View File

@ -2729,9 +2729,8 @@ void Achievements::DrawAchievementsWindow()
SmallString text; SmallString text;
ImVec2 text_size; ImVec2 text_size;
close_window = close_window = (ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_XMARK, 10.0f, 10.0f, 1.0f, 0.0f, true) ||
(ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_XMARK, 10.0f, 10.0f, -1.0f, -1.0f, 1.0f, 0.0f, true) || ImGuiFullscreen::WantsToCloseMenu());
ImGuiFullscreen::WantsToCloseMenu());
const ImRect title_bb(ImVec2(left, top), ImVec2(right, top + UIStyle.LargeFontSize)); const ImRect title_bb(ImVec2(left, top), ImVec2(right, top + UIStyle.LargeFontSize));
text.assign(s_state.game_title); text.assign(s_state.game_title);
@ -3163,7 +3162,7 @@ void Achievements::DrawLeaderboardsWindow()
if (!is_leaderboard_open) if (!is_leaderboard_open)
{ {
if (ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_XMARK, 10.0f, 10.0f, -1.0f, -1.0f, 1.0f, 0.0f, true) || if (ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_XMARK, 10.0f, 10.0f, 1.0f, 0.0f, true) ||
ImGuiFullscreen::WantsToCloseMenu()) ImGuiFullscreen::WantsToCloseMenu())
{ {
FullscreenUI::ReturnToPreviousWindow(); FullscreenUI::ReturnToPreviousWindow();
@ -3171,7 +3170,7 @@ void Achievements::DrawLeaderboardsWindow()
} }
else else
{ {
if (ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_CARET_LEFT, 10.0f, 10.0f, -1.0f, -1.0f, 1.0f, 0.0f, true) || if (ImGuiFullscreen::FloatingButton(ICON_FA_SQUARE_CARET_LEFT, 10.0f, 10.0f, 1.0f, 0.0f, true) ||
ImGuiFullscreen::WantsToCloseMenu()) ImGuiFullscreen::WantsToCloseMenu())
{ {
close_leaderboard_on_exit = true; close_leaderboard_on_exit = true;

188
src/core/fullscreen_ui.cpp
Unescape Escape View File

@ -354,45 +354,39 @@ static void DoSaveInputProfile(const std::string& name);
static bool DrawToggleSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static bool DrawToggleSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, bool default_value, bool enabled = true, const char* section, const char* key, bool default_value, bool enabled = true,
bool allow_tristate = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool allow_tristate = true);
static void DrawIntListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawIntListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, const char* section, const char* key, int default_value,
std::span<const char* const> options, bool translate_options = true, std::span<const char* const> options, bool translate_options = true,
int option_offset = 0, bool enabled = true, int option_offset = 0, bool enabled = true, std::string_view tr_context = TR_CONTEXT);
float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT,
std::string_view tr_context = TR_CONTEXT);
static void DrawIntListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawIntListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, const char* section, const char* key, int default_value,
std::span<const char* const> options, bool translate_options, std::span<const char* const> options, bool translate_options,
std::span<const int> values, bool enabled = true, std::span<const int> values, bool enabled = true,
float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT,
std::string_view tr_context = TR_CONTEXT); std::string_view tr_context = TR_CONTEXT);
static void DrawIntRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawIntRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, int min_value, int max_value, const char* section, const char* key, int default_value, int min_value, int max_value,
const char* format = "%d", bool enabled = true, const char* format = "%d", bool enabled = true);
float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT);
static void DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, int min_value, int max_value, const char* section, const char* key, int default_value, int min_value, int max_value,
int step_value, const char* format = "%d", bool enabled = true, int step_value, const char* format = "%d", bool enabled = true);
float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT);
static void DrawFloatRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawFloatRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, float min_value, const char* section, const char* key, float default_value, float min_value,
float max_value, const char* format = "%f", float multiplier = 1.0f, float max_value, const char* format = "%f", float multiplier = 1.0f,
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool enabled = true);
static void DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, float min_value, const char* section, const char* key, float default_value, float min_value,
float max_value, float step_value, float multiplier, const char* format = "%f", float max_value, float step_value, float multiplier, const char* format = "%f",
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool enabled = true);
static bool DrawIntRectSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static bool DrawIntRectSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* left_key, int default_left, const char* top_key, const char* section, const char* left_key, int default_left, const char* top_key,
int default_top, const char* right_key, int default_right, const char* bottom_key, int default_top, const char* right_key, int default_right, const char* bottom_key,
int default_bottom, int min_value, int max_value, const char* format = "%d", int default_bottom, int min_value, int max_value, const char* format = "%d",
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool enabled = true);
static void DrawStringListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawStringListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, const char* default_value, const char* section, const char* key, const char* default_value,
std::span<const char* const> options, std::span<const char* const> option_values, std::span<const char* const> options, std::span<const char* const> option_values,
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT, bool enabled = true, void (*changed_callback)(std::string_view) = nullptr,
void (*changed_callback)(std::string_view) = nullptr,
std::string_view tr_context = TR_CONTEXT); std::string_view tr_context = TR_CONTEXT);
template<typename DataType, typename SizeType> template<typename DataType, typename SizeType>
static void DrawEnumSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawEnumSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
@ -400,14 +394,13 @@ static void DrawEnumSetting(SettingsInterface* bsi, std::string_view title, std:
std::optional<DataType> (*from_string_function)(const char* str), std::optional<DataType> (*from_string_function)(const char* str),
const char* (*to_string_function)(DataType value), const char* (*to_string_function)(DataType value),
const char* (*to_display_string_function)(DataType value), SizeType option_count, const char* (*to_display_string_function)(DataType value), SizeType option_count,
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool enabled = true);
static void DrawFloatListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, static void DrawFloatListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, const char* const* options, const char* section, const char* key, float default_value, const char* const* options,
const float* option_values, size_t option_count, bool translate_options, const float* option_values, size_t option_count, bool translate_options,
bool enabled = true, float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT); bool enabled = true);
static void DrawFolderSetting(SettingsInterface* bsi, std::string_view title, const char* section, const char* key, static void DrawFolderSetting(SettingsInterface* bsi, std::string_view title, const char* section, const char* key,
const std::string& runtime_var, const std::string& runtime_var);
float height = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT);
static void PopulateGraphicsAdapterList(); static void PopulateGraphicsAdapterList();
static void PopulateGameListDirectoryCache(SettingsInterface* si); static void PopulateGameListDirectoryCache(SettingsInterface* si);
@ -2776,13 +2769,12 @@ void FullscreenUI::BeginVibrationMotorBinding(SettingsInterface* bsi, InputBindi
bool FullscreenUI::DrawToggleSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, bool FullscreenUI::DrawToggleSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, bool default_value, const char* section, const char* key, bool default_value,
bool enabled /* = true */, bool allow_tristate /* = true */, bool enabled /* = true */, bool allow_tristate /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
if (!allow_tristate || !IsEditingGameSettings(bsi)) if (!allow_tristate || !IsEditingGameSettings(bsi))
{ {
bool value = bsi->GetBoolValue(section, key, default_value); bool value = bsi->GetBoolValue(section, key, default_value);
if (!ToggleButton(title, summary, &value, enabled, height)) if (!ToggleButton(title, summary, &value, enabled))
return false; return false;
bsi->SetBoolValue(section, key, value); bsi->SetBoolValue(section, key, value);
@ -2792,7 +2784,7 @@ bool FullscreenUI::DrawToggleSetting(SettingsInterface* bsi, std::string_view ti
std::optional<bool> value(false); std::optional<bool> value(false);
if (!bsi->GetBoolValue(section, key, &value.value())) if (!bsi->GetBoolValue(section, key, &value.value()))
value.reset(); value.reset();
if (!ThreeWayToggleButton(title, summary, &value, enabled, height)) if (!ThreeWayToggleButton(title, summary, &value, enabled))
return false; return false;
if (value.has_value()) if (value.has_value())
@ -2809,7 +2801,6 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, std::string_view t
const char* section, const char* key, int default_value, const char* section, const char* key, int default_value,
std::span<const char* const> options, bool translate_options /* = true */, std::span<const char* const> options, bool translate_options /* = true */,
int option_offset /* = 0 */, bool enabled /* = true */, int option_offset /* = 0 */, bool enabled /* = true */,
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */,
std::string_view tr_context /* = TR_CONTEXT */) std::string_view tr_context /* = TR_CONTEXT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
@ -2824,7 +2815,7 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, std::string_view t
(translate_options ? Host::TranslateToStringView(tr_context, options[index]) : options[index])) : (translate_options ? Host::TranslateToStringView(tr_context, options[index]) : options[index])) :
FSUI_VSTR("Use Global Setting"); FSUI_VSTR("Use Global Setting");
if (MenuButtonWithValue(title, summary, value_text, enabled, height)) if (MenuButtonWithValue(title, summary, value_text, enabled))
{ {
ImGuiFullscreen::ChoiceDialogOptions cd_options; ImGuiFullscreen::ChoiceDialogOptions cd_options;
cd_options.reserve(options.size() + 1); cd_options.reserve(options.size() + 1);
@ -2865,7 +2856,6 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, std::string_view t
const char* section, const char* key, int default_value, const char* section, const char* key, int default_value,
std::span<const char* const> options, bool translate_options, std::span<const char* const> options, bool translate_options,
std::span<const int> values, bool enabled /* = true */, std::span<const int> values, bool enabled /* = true */,
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */,
std::string_view tr_context /* = TR_CONTEXT */) std::string_view tr_context /* = TR_CONTEXT */)
{ {
static constexpr auto value_to_index = [](s32 value, const std::span<const int> values) { static constexpr auto value_to_index = [](s32 value, const std::span<const int> values) {
@ -2892,7 +2882,7 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, std::string_view t
(translate_options ? Host::TranslateToStringView(tr_context, options[index]) : options[index])) : (translate_options ? Host::TranslateToStringView(tr_context, options[index]) : options[index])) :
FSUI_VSTR("Use Global Setting"); FSUI_VSTR("Use Global Setting");
if (MenuButtonWithValue(title, summary, value_text, enabled, height)) if (MenuButtonWithValue(title, summary, value_text, enabled))
{ {
ImGuiFullscreen::ChoiceDialogOptions cd_options; ImGuiFullscreen::ChoiceDialogOptions cd_options;
cd_options.reserve(options.size() + 1); cd_options.reserve(options.size() + 1);
@ -2931,8 +2921,7 @@ void FullscreenUI::DrawIntListSetting(SettingsInterface* bsi, std::string_view t
void FullscreenUI::DrawIntRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, void FullscreenUI::DrawIntRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, int min_value, const char* section, const char* key, int default_value, int min_value,
int max_value, const char* format /* = "%d" */, bool enabled /* = true */, int max_value, const char* format /* = "%d" */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<int> value = const std::optional<int> value =
@ -2940,7 +2929,7 @@ void FullscreenUI::DrawIntRangeSetting(SettingsInterface* bsi, std::string_view
const SmallString value_text = const SmallString value_text =
value.has_value() ? SmallString::from_sprintf(format, value.value()) : SmallString(FSUI_VSTR("Use Global Setting")); value.has_value() ? SmallString::from_sprintf(format, value.value()) : SmallString(FSUI_VSTR("Use Global Setting"));
if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled, height)) if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled))
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
if (!IsFixedPopupDialogOpen(title) || if (!IsFixedPopupDialogOpen(title) ||
@ -2970,10 +2959,8 @@ void FullscreenUI::DrawIntRangeSetting(SettingsInterface* bsi, std::string_view
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
EndFixedPopupDialog(); EndFixedPopupDialog();
@ -2982,8 +2969,7 @@ void FullscreenUI::DrawIntRangeSetting(SettingsInterface* bsi, std::string_view
void FullscreenUI::DrawFloatRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, void FullscreenUI::DrawFloatRangeSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, float min_value, const char* section, const char* key, float default_value, float min_value,
float max_value, const char* format /* = "%f" */, float max_value, const char* format /* = "%f" */,
float multiplier /* = 1.0f */, bool enabled /* = true */, float multiplier /* = 1.0f */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<float> value = const std::optional<float> value =
@ -2991,7 +2977,7 @@ void FullscreenUI::DrawFloatRangeSetting(SettingsInterface* bsi, std::string_vie
const SmallString value_text = value.has_value() ? SmallString::from_sprintf(format, value.value() * multiplier) : const SmallString value_text = value.has_value() ? SmallString::from_sprintf(format, value.value() * multiplier) :
SmallString(FSUI_VSTR("Use Global Setting")); SmallString(FSUI_VSTR("Use Global Setting"));
if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled, height)) if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled))
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
if (!IsFixedPopupDialogOpen(title) || if (!IsFixedPopupDialogOpen(title) ||
@ -3025,7 +3011,7 @@ void FullscreenUI::DrawFloatRangeSetting(SettingsInterface* bsi, std::string_vie
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -3035,8 +3021,7 @@ void FullscreenUI::DrawFloatRangeSetting(SettingsInterface* bsi, std::string_vie
void FullscreenUI::DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, void FullscreenUI::DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, float min_value, const char* section, const char* key, float default_value, float min_value,
float max_value, float step_value, float multiplier, float max_value, float step_value, float multiplier,
const char* format /* = "%f" */, bool enabled /* = true */, const char* format /* = "%f" */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<float> value = const std::optional<float> value =
@ -3046,7 +3031,7 @@ void FullscreenUI::DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_v
static bool manual_input = false; static bool manual_input = false;
if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled, height)) if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled))
{ {
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
manual_input = false; manual_input = false;
@ -3104,22 +3089,20 @@ void FullscreenUI::DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_v
ImGui::TextUnformatted(str_value); ImGui::TextUnformatted(str_value);
float step = 0; float step = 0;
if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, -1.0f, -1.0f, 1.0f, 0.0f, true, &button_pos, true)) if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, 1.0f, 0.0f, true, &button_pos, true))
{ {
step = step_value; step = step_value;
} }
if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos,
&button_pos, true)) true))
{ {
step = -step_value; step = -step_value;
} }
if (FloatingButton(ICON_FA_KEYBOARD, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_KEYBOARD, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos))
&button_pos))
{ {
manual_input = true; manual_input = true;
} }
if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos))
&button_pos))
{ {
dlg_value = default_value * multiplier; dlg_value = default_value * multiplier;
dlg_value_changed = true; dlg_value_changed = true;
@ -3145,7 +3128,7 @@ void FullscreenUI::DrawFloatSpinBoxSetting(SettingsInterface* bsi, std::string_v
SetSettingsChanged(bsi); SetSettingsChanged(bsi);
} }
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -3156,8 +3139,7 @@ bool FullscreenUI::DrawIntRectSetting(SettingsInterface* bsi, std::string_view t
const char* section, const char* left_key, int default_left, const char* top_key, const char* section, const char* left_key, int default_left, const char* top_key,
int default_top, const char* right_key, int default_right, const char* bottom_key, int default_top, const char* right_key, int default_right, const char* bottom_key,
int default_bottom, int min_value, int max_value, const char* format /* = "%d" */, int default_bottom, int min_value, int max_value, const char* format /* = "%d" */,
bool enabled /* = true */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<int> left_value = const std::optional<int> left_value =
@ -3176,7 +3158,7 @@ bool FullscreenUI::DrawIntRectSetting(SettingsInterface* bsi, std::string_view t
bottom_value.has_value() ? TinyString::from_sprintf(format, bottom_value.value()) : bottom_value.has_value() ? TinyString::from_sprintf(format, bottom_value.value()) :
TinyString(FSUI_VSTR("Default"))); TinyString(FSUI_VSTR("Default")));
if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled, height)) if (MenuButtonWithValue(title, summary, value_text.c_str(), enabled))
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
if (!IsFixedPopupDialogOpen(title) || if (!IsFixedPopupDialogOpen(title) ||
@ -3258,7 +3240,7 @@ bool FullscreenUI::DrawIntRectSetting(SettingsInterface* bsi, std::string_view t
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -3270,8 +3252,7 @@ bool FullscreenUI::DrawIntRectSetting(SettingsInterface* bsi, std::string_view t
void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, int default_value, int min_value, const char* section, const char* key, int default_value, int min_value,
int max_value, int step_value, const char* format /* = "%d" */, int max_value, int step_value, const char* format /* = "%d" */,
bool enabled /* = true */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<int> value = const std::optional<int> value =
@ -3284,7 +3265,7 @@ void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_vie
static bool manual_input = false; static bool manual_input = false;
if (MenuButtonWithValue(title, summary, value_text, enabled, height)) if (MenuButtonWithValue(title, summary, value_text, enabled))
{ {
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
manual_input = false; manual_input = false;
@ -3336,22 +3317,20 @@ void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_vie
ImGui::TextUnformatted(str_value); ImGui::TextUnformatted(str_value);
s32 step = 0; s32 step = 0;
if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, -1.0f, -1.0f, 1.0f, 0.0f, true, &button_pos, true)) if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, 1.0f, 0.0f, true, &button_pos, true))
{ {
step = step_value; step = step_value;
} }
if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos,
&button_pos, true)) true))
{ {
step = -step_value; step = -step_value;
} }
if (FloatingButton(ICON_FA_KEYBOARD, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_KEYBOARD, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos))
&button_pos))
{ {
manual_input = true; manual_input = true;
} }
if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos))
&button_pos))
{ {
dlg_value = default_value; dlg_value = default_value;
dlg_value_changed = true; dlg_value_changed = true;
@ -3377,7 +3356,7 @@ void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_vie
SetSettingsChanged(bsi); SetSettingsChanged(bsi);
} }
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -3387,8 +3366,8 @@ void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_vie
[[maybe_unused]] void FullscreenUI::DrawStringListSetting( [[maybe_unused]] void FullscreenUI::DrawStringListSetting(
SettingsInterface* bsi, std::string_view title, std::string_view summary, const char* section, const char* key, SettingsInterface* bsi, std::string_view title, std::string_view summary, const char* section, const char* key,
const char* default_value, std::span<const char* const> options, std::span<const char* const> option_values, const char* default_value, std::span<const char* const> options, std::span<const char* const> option_values,
bool enabled /* = true */, float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */, bool enabled /* = true */, void (*changed_callback)(std::string_view) /* = nullptr */,
void (*changed_callback)(std::string_view) /* = nullptr */, std::string_view tr_context /* = TR_CONTEXT */) std::string_view tr_context /* = TR_CONTEXT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<SmallString> value(bsi->GetOptionalSmallStringValue( const std::optional<SmallString> value(bsi->GetOptionalSmallStringValue(
@ -3413,7 +3392,7 @@ void FullscreenUI::DrawIntSpinBoxSetting(SettingsInterface* bsi, std::string_vie
value.has_value() ? ((index < options.size()) ? TRANSLATE_SV(tr_context, options[index]) : value.has_value() ? ((index < options.size()) ? TRANSLATE_SV(tr_context, options[index]) :
FSUI_VSTR("Unknown")) : FSUI_VSTR("Unknown")) :
FSUI_VSTR("Use Global Setting"), FSUI_VSTR("Use Global Setting"),
enabled, height)) enabled))
{ {
ImGuiFullscreen::ChoiceDialogOptions cd_options; ImGuiFullscreen::ChoiceDialogOptions cd_options;
cd_options.reserve(options.size() + 1); cd_options.reserve(options.size() + 1);
@ -3461,8 +3440,7 @@ void FullscreenUI::DrawEnumSetting(SettingsInterface* bsi, std::string_view titl
std::optional<DataType> (*from_string_function)(const char* str), std::optional<DataType> (*from_string_function)(const char* str),
const char* (*to_string_function)(DataType value), const char* (*to_string_function)(DataType value),
const char* (*to_display_string_function)(DataType value), SizeType option_count, const char* (*to_display_string_function)(DataType value), SizeType option_count,
bool enabled /* = true */, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<SmallString> value(bsi->GetOptionalSmallStringValue( const std::optional<SmallString> value(bsi->GetOptionalSmallStringValue(
@ -3473,7 +3451,7 @@ void FullscreenUI::DrawEnumSetting(SettingsInterface* bsi, std::string_view titl
if (MenuButtonWithValue(title, summary, if (MenuButtonWithValue(title, summary,
typed_value.has_value() ? to_display_string_function(typed_value.value()) : typed_value.has_value() ? to_display_string_function(typed_value.value()) :
FSUI_CSTR("Use Global Setting"), FSUI_CSTR("Use Global Setting"),
enabled, height)) enabled))
{ {
ImGuiFullscreen::ChoiceDialogOptions cd_options; ImGuiFullscreen::ChoiceDialogOptions cd_options;
cd_options.reserve(static_cast<u32>(option_count) + 1); cd_options.reserve(static_cast<u32>(option_count) + 1);
@ -3509,8 +3487,7 @@ void FullscreenUI::DrawEnumSetting(SettingsInterface* bsi, std::string_view titl
void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary, void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, std::string_view title, std::string_view summary,
const char* section, const char* key, float default_value, const char* section, const char* key, float default_value,
const char* const* options, const float* option_values, size_t option_count, const char* const* options, const float* option_values, size_t option_count,
bool translate_options, bool enabled /* = true */, bool translate_options, bool enabled /* = true */)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
const bool game_settings = IsEditingGameSettings(bsi); const bool game_settings = IsEditingGameSettings(bsi);
const std::optional<float> value( const std::optional<float> value(
@ -3543,7 +3520,7 @@ void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, std::string_view
(translate_options ? Host::TranslateToStringView(TR_CONTEXT, options[index]) : options[index]) : (translate_options ? Host::TranslateToStringView(TR_CONTEXT, options[index]) : options[index]) :
FSUI_VSTR("Unknown")) : FSUI_VSTR("Unknown")) :
FSUI_VSTR("Use Global Setting"), FSUI_VSTR("Use Global Setting"),
enabled, height)) enabled))
{ {
ImGuiFullscreen::ChoiceDialogOptions cd_options; ImGuiFullscreen::ChoiceDialogOptions cd_options;
cd_options.reserve(option_count + 1); cd_options.reserve(option_count + 1);
@ -3581,10 +3558,9 @@ void FullscreenUI::DrawFloatListSetting(SettingsInterface* bsi, std::string_view
} }
void FullscreenUI::DrawFolderSetting(SettingsInterface* bsi, std::string_view title, const char* section, void FullscreenUI::DrawFolderSetting(SettingsInterface* bsi, std::string_view title, const char* section,
const char* key, const std::string& runtime_var, const char* key, const std::string& runtime_var)
float height /* = ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
if (MenuButton(title, runtime_var, true, LAYOUT_MENU_BUTTON_HEIGHT)) if (MenuButton(title, runtime_var))
{ {
OpenFileSelector(title, true, OpenFileSelector(title, true,
[game_settings = IsEditingGameSettings(bsi), section = TinyString(section), [game_settings = IsEditingGameSettings(bsi), section = TinyString(section),
@ -4173,7 +4149,7 @@ void FullscreenUI::DrawInterfaceSettingsPage()
DrawStringListSetting(bsi, FSUI_ICONVSTR(ICON_FA_PAINTBRUSH, "Theme"), DrawStringListSetting(bsi, FSUI_ICONVSTR(ICON_FA_PAINTBRUSH, "Theme"),
FSUI_VSTR("Selects the color style to be used for Big Picture UI."), "UI", "FullscreenUITheme", FSUI_VSTR("Selects the color style to be used for Big Picture UI."), "UI", "FullscreenUITheme",
"Dark", s_theme_names, s_theme_values, true, LAYOUT_MENU_BUTTON_HEIGHT, "Dark", s_theme_names, s_theme_values, true,
[](std::string_view) { BeginTransition(DEFAULT_TRANSITION_TIME, &FullscreenUI::SetTheme); }); [](std::string_view) { BeginTransition(DEFAULT_TRANSITION_TIME, &FullscreenUI::SetTheme); });
if (const TinyString current_value = if (const TinyString current_value =
@ -5009,8 +4985,7 @@ void FullscreenUI::DrawControllerSettingsPage()
} }
} }
if (MenuButtonWithValue(FSUI_ICONVSTR(ICON_FA_KEYBOARD, "Buttons"), std::string_view(), if (MenuButtonWithValue(FSUI_ICONVSTR(ICON_FA_KEYBOARD, "Buttons"), std::string_view(),
pretty_binds_string.empty() ? FSUI_VSTR("-") : pretty_binds_string.view(), true, pretty_binds_string.empty() ? FSUI_VSTR("-") : pretty_binds_string.view()))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY))
{ {
std::vector<std::string_view> buttons_split(StringUtil::SplitString(binds_string, '&', true)); std::vector<std::string_view> buttons_split(StringUtil::SplitString(binds_string, '&', true));
ImGuiFullscreen::ChoiceDialogOptions options; ImGuiFullscreen::ChoiceDialogOptions options;
@ -5118,8 +5093,7 @@ void FullscreenUI::DrawControllerSettingsPage()
} }
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -5165,7 +5139,7 @@ void FullscreenUI::DrawControllerSettingsPage()
DrawIntListSetting(bsi, title, description, section.c_str(), si.name, si.IntegerDefaultValue(), DrawIntListSetting(bsi, title, description, section.c_str(), si.name, si.IntegerDefaultValue(),
std::span<const char* const>(si.options, option_count), true, si.IntegerMinValue(), true, std::span<const char* const>(si.options, option_count), true, si.IntegerMinValue(), true,
LAYOUT_MENU_BUTTON_HEIGHT, ci->name); ci->name);
} }
break; break;
@ -5995,11 +5969,8 @@ void FullscreenUI::DrawPostProcessingSettingsPage()
} }
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
@ -6064,11 +6035,8 @@ void FullscreenUI::DrawPostProcessingSettingsPage()
} }
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
EndFixedPopupDialog(); EndFixedPopupDialog();
@ -6479,8 +6447,7 @@ void FullscreenUI::DrawAchievementsLoginWindow()
const bool login_enabled = (std::strlen(username) > 0 && std::strlen(password) > 0 && !is_logging_in); const bool login_enabled = (std::strlen(username) > 0 && std::strlen(password) > 0 && !is_logging_in);
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_KEY, "Login"), login_enabled, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_KEY, "Login"), login_enabled, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
{ {
ImGuiFullscreen::OpenBackgroundProgressDialog(LOGIN_PROGRESS_NAME, FSUI_STR("Logging in to RetroAchievements..."), ImGuiFullscreen::OpenBackgroundProgressDialog(LOGIN_PROGRESS_NAME, FSUI_STR("Logging in to RetroAchievements..."),
0, 0, 0); 0, 0, 0);
@ -6504,11 +6471,8 @@ void FullscreenUI::DrawAchievementsLoginWindow()
}); });
} }
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_XMARK, "Cancel"), !is_logging_in, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_XMARK, "Cancel"), !is_logging_in, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
@ -6709,18 +6673,16 @@ void FullscreenUI::DrawPatchesOrCheatsSettingsPage(bool cheats)
ImGui::TextUnformatted(visible_value.c_str(), visible_value.end_ptr()); ImGui::TextUnformatted(visible_value.c_str(), visible_value.end_ptr());
s32 step = 0; s32 step = 0;
if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, -1.0f, -1.0f, 1.0f, 0.0f, true, &button_pos, if (FloatingButton(ICON_FA_CHEVRON_UP, padding.x, button_pos.y, 1.0f, 0.0f, true, &button_pos, true))
true))
{ {
step = step_value; step = step_value;
} }
if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, if (FloatingButton(ICON_FA_CHEVRON_DOWN, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos,
true, &button_pos, true)) true))
{ {
step = -step_value; step = -step_value;
} }
if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, -1.0f, -1.0f, 0.0f, true, if (FloatingButton(ICON_FA_TRASH, button_pos.x - padding.x, button_pos.y, -1.0f, 0.0f, true, &button_pos))
&button_pos))
{ {
range_value = ci.option_range_start - 1; range_value = ci.option_range_start - 1;
range_value_changed = true; range_value_changed = true;
@ -6757,8 +6719,7 @@ void FullscreenUI::DrawPatchesOrCheatsSettingsPage(bool cheats)
SetSettingsChanged(bsi); SetSettingsChanged(bsi);
} }
if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_VSTR("OK"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
CloseFixedPopupDialog(); CloseFixedPopupDialog();
EndMenuButtons(); EndMenuButtons();
@ -6864,8 +6825,7 @@ void FullscreenUI::DrawPatchesOrCheatsSettingsPage(bool cheats)
if (code_list.empty()) if (code_list.empty())
{ {
MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_STORE_SLASH, "No patches are available for this game."), MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_STORE_SLASH, "No patches are available for this game."), false);
false);
} }
else else
{ {
@ -6991,10 +6951,10 @@ void FullscreenUI::DrawPauseMenu()
3, // Achievements 3, // Achievements
}; };
// reduce spacing to fit all the buttons
ResetFocusHere(); ResetFocusHere();
BeginMenuButtons(submenu_item_count[static_cast<u32>(s_state.current_pause_submenu)], 1.0f, BeginMenuButtons(submenu_item_count[static_cast<u32>(s_state.current_pause_submenu)], 1.0f,
ImGuiFullscreen::LAYOUT_MENU_BUTTON_X_PADDING, ImGuiFullscreen::LAYOUT_MENU_BUTTON_Y_PADDING, LAYOUT_MENU_BUTTON_X_PADDING, LAYOUT_MENU_BUTTON_Y_PADDING, 0.0f, 4.0f);
ImGuiFullscreen::LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY);
switch (s_state.current_pause_submenu) switch (s_state.current_pause_submenu)
{ {
@ -7607,8 +7567,7 @@ void FullscreenUI::DrawResumeStateSelector()
ResetFocusHere(); ResetFocusHere();
BeginMenuButtons(); BeginMenuButtons();
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_PLAY, "Load State"), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_PLAY, "Load State"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
{ {
std::string game_path = std::move(entry.game_path); std::string game_path = std::move(entry.game_path);
std::string state_path = std::move(entry.state_path); std::string state_path = std::move(entry.state_path);
@ -7617,8 +7576,7 @@ void FullscreenUI::DrawResumeStateSelector()
DoStartPath(std::move(game_path), std::move(state_path)); DoStartPath(std::move(game_path), std::move(state_path));
} }
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_LIGHTBULB, "Clean Boot"), true, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_LIGHTBULB, "Clean Boot"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT))
{ {
std::string game_path = std::move(entry.game_path); std::string game_path = std::move(entry.game_path);
ClearSaveStateEntryList(); ClearSaveStateEntryList();
@ -7626,8 +7584,7 @@ void FullscreenUI::DrawResumeStateSelector()
DoStartPath(std::move(game_path)); DoStartPath(std::move(game_path));
} }
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_FOLDER_MINUS, "Delete State"), true, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_FOLDER_MINUS, "Delete State"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT))
{ {
if (FileSystem::DeleteFile(entry.state_path.c_str())) if (FileSystem::DeleteFile(entry.state_path.c_str()))
{ {
@ -7642,11 +7599,8 @@ void FullscreenUI::DrawResumeStateSelector()
} }
} }
if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_SQUARE_XMARK, "Cancel"), true, if (MenuButtonWithoutSummary(FSUI_ICONVSTR(ICON_FA_SQUARE_XMARK, "Cancel"), true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
ImGuiFullscreen::EndHorizontalMenuButtons(); ImGuiFullscreen::EndHorizontalMenuButtons();
@ -8251,7 +8205,7 @@ void FullscreenUI::DrawGameGrid(const ImVec2& heading_size)
BeginTransition([]() { SwitchToMainWindow(MainWindowType::Landing); }); BeginTransition([]() { SwitchToMainWindow(MainWindowType::Landing); });
ResetFocusHere(); ResetFocusHere();
BeginMenuButtons(0, 0.0f, 15.0f, 15.0f, 0.0f, 20.0f, 20.0f); BeginMenuButtons(0, 0.0f, 15.0f, 15.0f, 20.0f, 20.0f);
const ImGuiStyle& style = ImGui::GetStyle(); const ImGuiStyle& style = ImGui::GetStyle();

524
src/util/imgui_fullscreen.cpp
Unescape Escape View File

@ -42,6 +42,8 @@ namespace ImGuiFullscreen {
static constexpr float MENU_BACKGROUND_ANIMATION_TIME = 0.5f; static constexpr float MENU_BACKGROUND_ANIMATION_TIME = 0.5f;
static constexpr float MENU_ITEM_BORDER_ROUNDING = 10.0f; static constexpr float MENU_ITEM_BORDER_ROUNDING = 10.0f;
static constexpr float MENU_ITEM_TITLE_SUMMARY_SPACING = 6.0f;
static constexpr float MENU_ITEM_EXTRA_HEIGHT = 2.0f;
static constexpr float SMOOTH_SCROLLING_SPEED = 3.5f; static constexpr float SMOOTH_SCROLLING_SPEED = 3.5f;
static std::optional<Image> LoadTextureImage(std::string_view path, u32 svg_width, u32 svg_height); static std::optional<Image> LoadTextureImage(std::string_view path, u32 svg_width, u32 svg_height);
@ -54,6 +56,8 @@ static void DrawNotifications(ImVec2& position, float spacing);
static void DrawToast(); static void DrawToast();
static bool MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered, static bool MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered,
ImRect* bb, ImGuiButtonFlags flags = 0, float hover_alpha = 1.0f); ImRect* bb, ImGuiButtonFlags flags = 0, float hover_alpha = 1.0f);
static bool MenuButtonFrame(std::string_view str_id, bool enabled, const ImRect& bb, bool* visible, bool* hovered,
ImGuiButtonFlags flags = 0, float hover_alpha = 1.0f);
static ImGuiID GetBackgroundProgressID(std::string_view str_id); static ImGuiID GetBackgroundProgressID(std::string_view str_id);
namespace { namespace {
@ -90,6 +94,35 @@ struct BackgroundProgressDialogData
s32 value; s32 value;
}; };
struct MenuButtonBounds
{
ImVec2 title_size;
ImVec2 value_size;
ImVec2 summary_size;
ImRect frame_bb;
ImRect title_bb;
ImRect value_bb;
ImRect summary_bb;
float available_width = CalcAvailWidth();
float available_non_value_width;
MenuButtonBounds(const std::string_view& title, const std::string_view& value, const std::string_view& summary);
MenuButtonBounds(const std::string_view& title, const ImVec2& value_size, const std::string_view& summary);
MenuButtonBounds(const ImVec2& title_size, const ImVec2& value_size, const ImVec2& summary_size);
static float CalcAvailWidth();
static float GetSingleLineHeight(float y_padding = LAYOUT_MENU_BUTTON_Y_PADDING);
void CalcBB();
void CalcTitleSize(const std::string_view& title);
void SetValueSize(const ImVec2& value_size);
void CalcValueSize(const std::string_view& value);
void CalcSummarySize(const std::string_view& summary);
};
class MessageDialog : public PopupDialog class MessageDialog : public PopupDialog
{ {
public: public:
@ -1270,8 +1303,8 @@ void ImGuiFullscreen::PrerenderMenuButtonBorder()
void ImGuiFullscreen::BeginMenuButtons(u32 num_items /* = 0 */, float y_align /* = 0.0f */, void ImGuiFullscreen::BeginMenuButtons(u32 num_items /* = 0 */, float y_align /* = 0.0f */,
float x_padding /* = LAYOUT_MENU_BUTTON_X_PADDING */, float x_padding /* = LAYOUT_MENU_BUTTON_X_PADDING */,
float y_padding /* = LAYOUT_MENU_BUTTON_Y_PADDING */, float y_padding /* = LAYOUT_MENU_BUTTON_Y_PADDING */,
float item_height /* = LAYOUT_MENU_BUTTON_HEIGHT */, float x_spacing /* = 0.0f */, float y_spacing /* = LAYOUT_MENU_BUTTON_SPACING */,
float x_spacing /* = 0.0f */, float y_spacing /* = LAYOUT_MENU_BUTTON_SPACING */) bool prerender_frame /*= true*/)
{ {
s_state.menu_button_index = 0; s_state.menu_button_index = 0;
@ -1288,10 +1321,11 @@ void ImGuiFullscreen::BeginMenuButtons(u32 num_items /* = 0 */, float y_align /*
switch (s_state.has_pending_nav_move) switch (s_state.has_pending_nav_move)
{ {
case ImGuiDir_Up: case ImGuiDir_Up:
ImGui::SetScrollY(std::max(ImGui::GetScrollY() - item_height, 0.0f)); ImGui::SetScrollY(std::max(ImGui::GetScrollY() - MenuButtonBounds::GetSingleLineHeight(y_padding), 0.0f));
break; break;
case ImGuiDir_Down: case ImGuiDir_Down:
ImGui::SetScrollY(std::min(ImGui::GetScrollY() + item_height, ImGui::GetScrollMaxY())); ImGui::SetScrollY(
std::min(ImGui::GetScrollY() + MenuButtonBounds::GetSingleLineHeight(y_padding), ImGui::GetScrollMaxY()));
break; break;
default: default:
break; break;
@ -1308,14 +1342,16 @@ void ImGuiFullscreen::BeginMenuButtons(u32 num_items /* = 0 */, float y_align /*
if (y_align != 0.0f) if (y_align != 0.0f)
{ {
const float real_item_height = LayoutScale(item_height) + (LayoutScale(y_padding) * 2.0f) + LayoutScale(y_spacing); const ImGuiStyle& style = ImGui::GetStyle();
const float total_size = (static_cast<float>(num_items) * real_item_height) + (LayoutScale(y_padding) * 2.0f); const float real_item_height = MenuButtonBounds::GetSingleLineHeight(y_padding) + style.ItemSpacing.y;
const float window_height = ImGui::GetWindowHeight(); const float total_size = (static_cast<float>(num_items) * real_item_height - style.ItemSpacing.y);
const float window_height = ImGui::GetWindowHeight() - (style.WindowPadding.y * 2.0f);
if (window_height > total_size) if (window_height > total_size)
ImGui::SetCursorPosY((window_height - total_size) * y_align); ImGui::SetCursorPosY((window_height - total_size) * y_align);
} }
PrerenderMenuButtonBorder(); if (prerender_frame)
PrerenderMenuButtonBorder();
} }
void ImGuiFullscreen::EndMenuButtons() void ImGuiFullscreen::EndMenuButtons()
@ -1348,31 +1384,27 @@ void ImGuiFullscreen::DrawWindowTitle(std::string_view title)
void ImGuiFullscreen::GetMenuButtonFrameBounds(float height, ImVec2* pos, ImVec2* size) void ImGuiFullscreen::GetMenuButtonFrameBounds(float height, ImVec2* pos, ImVec2* size)
{ {
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindowRead();
*pos = window->DC.CursorPos; *pos = window->DC.CursorPos;
*size = ImVec2(window->WorkRect.GetWidth(), LayoutScale(height) + ImGui::GetStyle().FramePadding.y * 2.0f); *size = ImVec2(window->WorkRect.GetWidth(), LayoutScale(height) + ImGui::GetStyle().FramePadding.y * 2.0f);
} }
bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered, bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, const ImRect& bb, bool* visible,
ImRect* bb, ImGuiButtonFlags flags, float hover_alpha) bool* hovered, ImGuiButtonFlags flags, float hover_alpha)
{ {
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindow();
if (window->SkipItems) if (ImGui::GetCurrentWindowRead()->SkipItems)
{ {
*visible = false; *visible = false;
*hovered = false; *hovered = false;
return false; return false;
} }
ImVec2 pos, size;
GetMenuButtonFrameBounds(height, &pos, &size);
*bb = ImRect(pos, pos + size);
const ImGuiID id = window->GetID(IMSTR_START_END(str_id)); const ImGuiID id = window->GetID(IMSTR_START_END(str_id));
ImGui::ItemSize(size); ImGui::ItemSize(bb.GetSize());
if (enabled) if (enabled)
{ {
if (!ImGui::ItemAdd(*bb, id)) if (!ImGui::ItemAdd(bb, id))
{ {
*visible = false; *visible = false;
*hovered = false; *hovered = false;
@ -1381,7 +1413,7 @@ bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, flo
} }
else else
{ {
if (ImGui::IsClippedEx(*bb, id)) if (ImGui::IsClippedEx(bb, id))
{ {
*visible = false; *visible = false;
*hovered = false; *hovered = false;
@ -1395,7 +1427,7 @@ bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, flo
bool pressed; bool pressed;
if (enabled) if (enabled)
{ {
pressed = ImGui::ButtonBehavior(*bb, id, hovered, &held, flags); pressed = ImGui::ButtonBehavior(bb, id, hovered, &held, flags);
if (*hovered) if (*hovered)
{ {
const ImU32 col = ImGui::GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered, hover_alpha); const ImU32 col = ImGui::GetColorU32(held ? ImGuiCol_ButtonActive : ImGuiCol_ButtonHovered, hover_alpha);
@ -1403,7 +1435,7 @@ bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, flo
const float t = static_cast<float>(std::min(std::abs(std::sin(ImGui::GetTime() * 0.75) * 1.1), 1.0)); const float t = static_cast<float>(std::min(std::abs(std::sin(ImGui::GetTime() * 0.75) * 1.1), 1.0));
ImGui::PushStyleColor(ImGuiCol_Border, ImGui::GetColorU32(ImGuiCol_Border, t)); ImGui::PushStyleColor(ImGuiCol_Border, ImGui::GetColorU32(ImGuiCol_Border, t));
DrawMenuButtonFrame(bb->Min, bb->Max, col, true); DrawMenuButtonFrame(bb.Min, bb.Max, col, true);
ImGui::PopStyleColor(); ImGui::PopStyleColor();
} }
@ -1414,6 +1446,18 @@ bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, flo
held = false; held = false;
} }
return pressed;
}
bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered,
ImRect* bb, ImGuiButtonFlags flags, float hover_alpha)
{
ImVec2 pos, size;
GetMenuButtonFrameBounds(height, &pos, &size);
*bb = ImRect(pos, pos + size);
const bool pressed = MenuButtonFrame(str_id, enabled, *bb, visible, hovered, flags, hover_alpha);
const ImGuiStyle& style = ImGui::GetStyle(); const ImGuiStyle& style = ImGui::GetStyle();
bb->Min += style.FramePadding; bb->Min += style.FramePadding;
bb->Max -= style.FramePadding; bb->Max -= style.FramePadding;
@ -1474,6 +1518,93 @@ bool ImGuiFullscreen::MenuButtonFrame(std::string_view str_id, bool enabled, flo
return result; return result;
} }
float ImGuiFullscreen::MenuButtonBounds::CalcAvailWidth()
{
return ImGui::GetCurrentWindowRead()->WorkRect.GetWidth() - ImGui::GetStyle().FramePadding.x * 2.0f;
}
void ImGuiFullscreen::MenuButtonBounds::CalcValueSize(const std::string_view& value)
{
SetValueSize(value.empty() ? ImVec2() :
UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, FLT_MAX,
available_width * 0.5f, IMSTR_START_END(value)));
}
void ImGuiFullscreen::MenuButtonBounds::SetValueSize(const ImVec2& size)
{
value_size = size;
available_non_value_width = available_width - ((size.x > 0.0f) ? (size.x + LayoutScale(16.0f)) : 0.0f);
}
void ImGuiFullscreen::MenuButtonBounds::CalcTitleSize(const std::string_view& title)
{
title_size = title.empty() ? ImVec2() :
UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, FLT_MAX,
available_non_value_width, IMSTR_START_END(title));
}
void ImGuiFullscreen::MenuButtonBounds::CalcSummarySize(const std::string_view& summary)
{
summary_size = summary.empty() ?
ImVec2() :
UIStyle.Font->CalcTextSizeA(UIStyle.MediumFontSize, UIStyle.NormalFontWeight, FLT_MAX,
available_non_value_width, IMSTR_START_END(summary));
}
ImGuiFullscreen::MenuButtonBounds::MenuButtonBounds(const std::string_view& title, const std::string_view& value,
const std::string_view& summary)
{
CalcValueSize(value);
CalcTitleSize(title);
CalcSummarySize(summary);
CalcBB();
}
ImGuiFullscreen::MenuButtonBounds::MenuButtonBounds(const std::string_view& title, const ImVec2& value_size,
const std::string_view& summary)
{
SetValueSize(value_size);
CalcTitleSize(title);
CalcSummarySize(summary);
CalcBB();
}
ImGuiFullscreen::MenuButtonBounds::MenuButtonBounds(const ImVec2& title_size, const ImVec2& value_size,
const ImVec2& summary_size)
: title_size(title_size), value_size(value_size), summary_size(summary_size), available_width(CalcAvailWidth())
{
CalcBB();
}
void ImGuiFullscreen::MenuButtonBounds::CalcBB()
{
// give the frame a bit of a chin, because otherwise it's too cramped
const ImVec2& padding = ImGui::GetStyle().FramePadding;
const ImVec2 pos = ImGui::GetCurrentWindowRead()->DC.CursorPos + padding;
const float summary_spacing = LayoutScale(MENU_ITEM_TITLE_SUMMARY_SPACING);
const float content_height =
std::max(title_size.y, value_size.y) +
((summary_size.x > 0.0f) ? (summary_size.y + LayoutScale(MENU_ITEM_EXTRA_HEIGHT) + summary_spacing) : 0.0f);
const ImVec2 br_pos = pos + ImVec2(available_width, content_height);
frame_bb = ImRect(pos - padding, br_pos + padding);
title_bb = ImRect(pos, ImVec2(pos.x + title_size.x, pos.y + title_size.y));
if (value_size.x > 0.0f)
value_bb = ImRect(ImVec2(br_pos.x - value_size.x, pos.y), br_pos);
if (summary_size.x > 0.0f)
{
const float summary_start_y = pos.y + std::max(title_size.y, value_size.y) + summary_spacing;
summary_bb =
ImRect(ImVec2(pos.x, summary_start_y), ImVec2(pos.x + summary_size.x, summary_start_y + summary_size.y));
}
}
float ImGuiFullscreen::MenuButtonBounds::GetSingleLineHeight(float padding)
{
return (LayoutScale(padding) * 2.0f) + UIStyle.LargeFontSize;
}
void ImGuiFullscreen::ResetMenuButtonFrame() void ImGuiFullscreen::ResetMenuButtonFrame()
{ {
s_state.had_hovered_menu_item = false; s_state.had_hovered_menu_item = false;
@ -1504,7 +1635,7 @@ void ImGuiFullscreen::RenderShadowedTextClipped(ImDrawList* draw_list, ImFont* f
const ImVec2* clip_min = clip_rect ? &clip_rect->Min : &pos_min; const ImVec2* clip_min = clip_rect ? &clip_rect->Min : &pos_min;
const ImVec2* clip_max = clip_rect ? &clip_rect->Max : &pos_max; const ImVec2* clip_max = clip_rect ? &clip_rect->Max : &pos_max;
bool need_clipping = (pos.x + text_size.x >= clip_max->x) || (pos.y + text_size.y >= clip_max->y); bool need_clipping = (pos.x + text_size.x > clip_max->x) || (pos.y + text_size.y > clip_max->y);
if (clip_rect) // If we had no explicit clipping rectangle then pos==clip_min if (clip_rect) // If we had no explicit clipping rectangle then pos==clip_min
need_clipping |= (pos.x < clip_min->x) || (pos.y < clip_min->y); need_clipping |= (pos.x < clip_min->x) || (pos.y < clip_min->y);
@ -1715,88 +1846,94 @@ bool ImGuiFullscreen::MenuHeadingButton(std::string_view title, std::string_view
} }
bool ImGuiFullscreen::MenuButton(std::string_view title, std::string_view summary, bool enabled /* = true */, bool ImGuiFullscreen::MenuButton(std::string_view title, std::string_view summary, bool enabled /* = true */,
float height /* = LAYOUT_MENU_BUTTON_HEIGHT */,
const ImVec2& text_align /* = ImVec2(0.0f, 0.0f) */) const ImVec2& text_align /* = ImVec2(0.0f, 0.0f) */)
{ {
ImRect bb; return MenuButtonWithValue(title, summary, {}, enabled, text_align);
}
bool ImGuiFullscreen::MenuButtonWithoutSummary(std::string_view title, bool enabled /* = true */,
const ImVec2& text_align /* = ImVec2(0.0f, 0.0f) */)
{
return MenuButtonWithValue(title, {}, {}, enabled, text_align);
}
bool ImGuiFullscreen::MenuButtonWithValue(std::string_view title, std::string_view summary, std::string_view value,
bool enabled /* = true*/, const ImVec2& text_align /* = ImVec2(0.0f, 0.0f)*/)
{
const MenuButtonBounds bb(title, value, summary);
bool visible, hovered; bool visible, hovered;
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb); bool pressed = MenuButtonFrame(title, enabled, bb.frame_bb, &visible, &hovered);
if (!visible) if (!visible)
return false; return false;
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const ImRect title_bb(bb.Min, ImVec2(bb.Max.x, midpoint));
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled]; const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max, RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.title_bb.Min,
ImGui::GetColorU32(color), title, nullptr, text_align, 0.0f, &title_bb); bb.title_bb.Max, ImGui::GetColorU32(color), title, &bb.title_size, text_align,
bb.title_size.x, &bb.title_bb);
if (!value.empty())
{
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.value_bb.Min,
bb.value_bb.Max, ImGui::GetColorU32(color), value, &bb.value_size, ImVec2(1.0f, 0.5f),
bb.value_size.x, &bb.value_bb);
}
if (!summary.empty()) if (!summary.empty())
{ {
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), bb.Max); RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, bb.summary_bb.Min,
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min, bb.summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, &bb.summary_size,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr, text_align, text_align, bb.summary_size.x, &bb.summary_bb);
0.0f, &summary_bb);
} }
s_state.menu_button_index++; s_state.menu_button_index++;
return pressed; return pressed;
} }
bool ImGuiFullscreen::MenuButtonWithoutSummary(std::string_view title, bool enabled /* = true */,
float height, /* = LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY */
const ImVec2& text_align /* = ImVec2(0.0f, 0.0f) */)
{
return MenuButton(title, {}, enabled, height, text_align);
}
bool ImGuiFullscreen::MenuImageButton(std::string_view title, std::string_view summary, ImTextureID user_texture_id, bool ImGuiFullscreen::MenuImageButton(std::string_view title, std::string_view summary, ImTextureID user_texture_id,
const ImVec2& image_size, bool enabled /* = true */, const ImVec2& image_size, bool enabled /* = true */,
float height /* = LAYOUT_MENU_BUTTON_HEIGHT */,
const ImVec2& uv0 /* = ImVec2(0.0f, 0.0f) */, const ImVec2& uv0 /* = ImVec2(0.0f, 0.0f) */,
const ImVec2& uv1 /* = ImVec2(1.0f, 1.0f) */) const ImVec2& uv1 /* = ImVec2(1.0f, 1.0f) */)
{ {
ImRect bb; MenuButtonBounds bb(title, ImVec2(), summary);
bool visible, hovered; bool visible, hovered;
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb); bool pressed = MenuButtonFrame(title, enabled, bb.frame_bb, &visible, &hovered);
if (!visible) if (!visible)
return false; return false;
ImGui::GetWindowDrawList()->AddImage(user_texture_id, bb.Min, bb.Min + image_size, uv0, uv1, ImGui::GetWindowDrawList()->AddImage(user_texture_id, bb.title_bb.Min, bb.title_bb.Min + image_size, uv0, uv1,
enabled ? IM_COL32(255, 255, 255, 255) : enabled ? IM_COL32(255, 255, 255, 255) :
ImGui::GetColorU32(ImGuiCol_TextDisabled)); ImGui::GetColorU32(ImGuiCol_TextDisabled));
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f); const float text_offset = image_size.x + LayoutScale(15.0f);
const float text_start_x = bb.Min.x + image_size.x + LayoutScale(15.0f); bb.title_bb.Min.x += text_offset;
const ImRect title_bb(ImVec2(text_start_x, bb.Min.y), ImVec2(bb.Max.x, midpoint)); bb.title_bb.Max.x += text_offset;
const ImRect summary_bb(ImVec2(text_start_x, midpoint), bb.Max);
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled]; const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max, RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.title_bb.Min,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0f, 0.0f), 0.0f, &title_bb); bb.title_bb.Max, ImGui::GetColorU32(color), title, &bb.title_size, ImVec2(0.0f, 0.0f),
bb.title_size.x, &bb.title_bb);
if (!summary.empty()) if (!summary.empty())
{ {
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min, RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, bb.summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr, bb.summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, &bb.summary_size,
ImVec2(0.0f, 0.0f), 0.0f, &summary_bb); ImVec2(0.0f, 0.0f), bb.summary_size.x, &bb.summary_bb);
} }
s_state.menu_button_index++; s_state.menu_button_index++;
return pressed; return pressed;
} }
bool ImGuiFullscreen::FloatingButton(std::string_view text, float x, float y, float width /* = -1.0f */, bool ImGuiFullscreen::FloatingButton(std::string_view text, float x, float y, float anchor_x /* = 0.0f */,
float height /* = LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY */, float anchor_y /* = 0.0f */, bool enabled /* = true */,
float anchor_x /* = 0.0f */, float anchor_y /* = 0.0f */, ImVec2* out_position /* = nullptr */, bool repeat_button /* = false */)
bool enabled /* = true */, ImVec2* out_position /* = nullptr */,
bool repeat_button /* = false */)
{ {
const ImVec2 text_size = UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, const ImVec2 text_size = UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight,
std::numeric_limits<float>::max(), 0.0f, IMSTR_START_END(text)); std::numeric_limits<float>::max(), 0.0f, IMSTR_START_END(text));
const ImVec2& padding(ImGui::GetStyle().FramePadding); const ImVec2& padding(ImGui::GetStyle().FramePadding);
if (width < 0.0f) const float width = (padding.x * 2.0f) + text_size.x;
width = (padding.x * 2.0f) + text_size.x; const float height = (padding.y * 2.0f) + text_size.y;
if (height < 0.0f)
height = (padding.y * 2.0f) + text_size.y;
const ImVec2 window_size(ImGui::GetWindowSize()); const ImVec2 window_size(ImGui::GetWindowSize());
if (anchor_x == -1.0f) if (anchor_x == -1.0f)
@ -1869,38 +2006,29 @@ bool ImGuiFullscreen::FloatingButton(std::string_view text, float x, float y, fl
return pressed; return pressed;
} }
bool ImGuiFullscreen::ToggleButton(std::string_view title, std::string_view summary, bool* v, bool enabled /* = true */, bool ImGuiFullscreen::ToggleButton(std::string_view title, std::string_view summary, bool* v, bool enabled /* = true */)
float height /* = LAYOUT_MENU_BUTTON_HEIGHT */)
{ {
ImRect bb; const ImVec2 toggle_size = LayoutScale(50.0f, 25.0f);
const MenuButtonBounds bb(title, ImVec2(toggle_size.x, toggle_size.y), summary);
bool visible, hovered; bool visible, hovered;
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb, ImGuiButtonFlags_PressedOnClick); bool pressed = MenuButtonFrame(title, enabled, bb.frame_bb, &visible, &hovered, ImGuiButtonFlags_PressedOnClick);
if (!visible) if (!visible)
return false; return false;
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const ImRect title_bb(bb.Min, ImVec2(bb.Max.x, midpoint));
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), bb.Max);
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled]; const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max, RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.title_bb.Min,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0, 0.0f), 0.0f, &title_bb); bb.title_bb.Max, ImGui::GetColorU32(color), title, &bb.title_size, ImVec2(0.0f, 0.0f),
bb.title_size.x, &bb.title_bb);
if (!summary.empty()) if (!summary.empty())
{ {
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min, RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, bb.summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr, bb.summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, &bb.summary_size,
ImVec2(0.0, 0.0f), 0.0f, &summary_bb); ImVec2(0.0f, 0.0f), bb.summary_size.x, &bb.summary_bb);
} }
const float toggle_width = LayoutScale(50.0f);
const float toggle_height = LayoutScale(25.0f);
const float toggle_x = LayoutScale(8.0f);
const float toggle_y = (LayoutScale(height) - toggle_height) * 0.5f;
const float toggle_radius = toggle_height * 0.5f;
const ImVec2 toggle_pos(bb.Max.x - toggle_width - toggle_x, bb.Min.y + toggle_y);
if (pressed) if (pressed)
*v = !*v; *v = !*v;
@ -1928,10 +2056,13 @@ bool ImGuiFullscreen::ToggleButton(std::string_view title, std::string_view summ
col_knob = IM_COL32(255, 255, 255, 255); col_knob = IM_COL32(255, 255, 255, 255);
} }
dl->AddRectFilled(toggle_pos, ImVec2(toggle_pos.x + toggle_width, toggle_pos.y + toggle_height), col_bg, const float toggle_radius = toggle_size.y * 0.5f;
toggle_height * 0.5f); const float toggle_y_offset = ImFloor((bb.value_bb.GetHeight() - toggle_size.y) * 0.5f);
const ImVec2 toggle_pos = ImVec2(bb.value_bb.Min.x, bb.value_bb.Min.y + toggle_y_offset);
dl->AddRectFilled(toggle_pos, ImVec2(toggle_pos.x + toggle_size.x, toggle_pos.y + toggle_size.y), col_bg,
toggle_size.y * 0.5f);
dl->AddCircleFilled( dl->AddCircleFilled(
ImVec2(toggle_pos.x + toggle_radius + t * (toggle_width - toggle_radius * 2.0f), toggle_pos.y + toggle_radius), ImVec2(toggle_pos.x + toggle_radius + t * (toggle_size.x - toggle_radius * 2.0f), toggle_pos.y + toggle_radius),
toggle_radius - 1.5f, col_knob, 32); toggle_radius - 1.5f, col_knob, 32);
s_state.menu_button_index++; s_state.menu_button_index++;
@ -1939,37 +2070,29 @@ bool ImGuiFullscreen::ToggleButton(std::string_view title, std::string_view summ
} }
bool ImGuiFullscreen::ThreeWayToggleButton(std::string_view title, std::string_view summary, std::optional<bool>* v, bool ImGuiFullscreen::ThreeWayToggleButton(std::string_view title, std::string_view summary, std::optional<bool>* v,
bool enabled /* = true */, float height /* = LAYOUT_MENU_BUTTON_HEIGHT */) bool enabled /* = true */)
{ {
ImRect bb; const ImVec2 toggle_size = LayoutScale(50.0f, 25.0f);
const MenuButtonBounds bb(title, ImVec2(toggle_size.x, toggle_size.y), summary);
bool visible, hovered; bool visible, hovered;
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb, ImGuiButtonFlags_PressedOnClick); bool pressed = MenuButtonFrame(title, enabled, bb.frame_bb, &visible, &hovered, ImGuiButtonFlags_PressedOnClick);
if (!visible) if (!visible)
return false; return false;
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const ImRect title_bb(bb.Min, ImVec2(bb.Max.x, midpoint));
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), bb.Max);
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled]; const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max, RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.title_bb.Min,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0, 0.0f), 0.0f, &title_bb); bb.title_bb.Max, ImGui::GetColorU32(color), title, &bb.title_size, ImVec2(0.0f, 0.0f),
bb.title_size.x, &bb.title_bb);
if (!summary.empty()) if (!summary.empty())
{ {
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min, RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, bb.summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr, bb.summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, &bb.summary_size,
ImVec2(0.0, 0.0f), 0.0f, &summary_bb); ImVec2(0.0f, 0.0f), bb.summary_size.x, &bb.summary_bb);
} }
const float toggle_width = LayoutScale(50.0f);
const float toggle_height = LayoutScale(25.0f);
const float toggle_x = LayoutScale(8.0f);
const float toggle_y = (LayoutScale(LAYOUT_MENU_BUTTON_HEIGHT) - toggle_height) * 0.5f;
const float toggle_radius = toggle_height * 0.5f;
const ImVec2 toggle_pos(bb.Max.x - toggle_width - toggle_x, bb.Min.y + toggle_y);
if (pressed) if (pressed)
{ {
if (v->has_value() && v->value()) if (v->has_value() && v->value())
@ -2002,10 +2125,13 @@ bool ImGuiFullscreen::ThreeWayToggleButton(std::string_view title, std::string_v
col_bg = ImGui::GetColorU32(ImLerp(v->has_value() ? HEX_TO_IMVEC4(0xc45100, 0xff) : HEX_TO_IMVEC4(0x757575, 0xff), col_bg = ImGui::GetColorU32(ImLerp(v->has_value() ? HEX_TO_IMVEC4(0xc45100, 0xff) : HEX_TO_IMVEC4(0x757575, 0xff),
UIStyle.SecondaryStrongColor, color_t)); UIStyle.SecondaryStrongColor, color_t));
dl->AddRectFilled(toggle_pos, ImVec2(toggle_pos.x + toggle_width, toggle_pos.y + toggle_height), col_bg, const float toggle_radius = toggle_size.y * 0.5f;
toggle_height * 0.5f); const float toggle_y_offset = ImFloor((bb.value_bb.GetHeight() - toggle_size.y) * 0.5f);
const ImVec2 toggle_pos = ImVec2(bb.value_bb.Min.x, bb.value_bb.Min.y + toggle_y_offset);
dl->AddRectFilled(toggle_pos, ImVec2(toggle_pos.x + toggle_size.x, toggle_pos.y + toggle_size.y), col_bg,
toggle_size.y * 0.5f);
dl->AddCircleFilled( dl->AddCircleFilled(
ImVec2(toggle_pos.x + toggle_radius + t * (toggle_width - toggle_radius * 2.0f), toggle_pos.y + toggle_radius), ImVec2(toggle_pos.x + toggle_radius + t * (toggle_size.x - toggle_radius * 2.0f), toggle_pos.y + toggle_radius),
toggle_radius - 1.5f, IM_COL32(255, 255, 255, 255), 32); toggle_radius - 1.5f, IM_COL32(255, 255, 255, 255), 32);
s_state.menu_button_index++; s_state.menu_button_index++;
@ -2014,36 +2140,10 @@ bool ImGuiFullscreen::ThreeWayToggleButton(std::string_view title, std::string_v
bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summary, s32* value, s32 min, s32 max, bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summary, s32* value, s32 min, s32 max,
s32 increment, const char* format /* = "%d" */, bool enabled /* = true */, s32 increment, const char* format /* = "%d" */, bool enabled /* = true */,
float height /* = LAYOUT_MENU_BUTTON_HEIGHT */, std::string_view ok_text /* = "OK" */) std::string_view ok_text /* = "OK" */)
{ {
ImRect bb; const SmallString value_text = SmallString::from_sprintf(format, *value);
bool visible, hovered; if (MenuButtonWithValue(title, summary, value_text, enabled))
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb);
if (!visible)
return false;
SmallString value_text = SmallString::from_sprintf(format, *value);
const ImVec2 value_size = UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, FLT_MAX, 0.0f,
IMSTR_START_END(value_text));
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const float text_end = bb.Max.x - value_size.x;
const ImRect title_bb(bb.Min, ImVec2(text_end, midpoint));
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), ImVec2(text_end, bb.Max.y));
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0f, 0.0f), 0.0f, &title_bb);
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.Min, bb.Max,
ImGui::GetColorU32(color), value_text, &value_size, ImVec2(1.0f, 0.5f), 0.0f, &bb);
if (!summary.empty())
{
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr,
ImVec2(0.0f, 0.0f), 0.0f, &summary_bb);
}
if (pressed)
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
bool changed = false; bool changed = false;
@ -2065,10 +2165,8 @@ bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summa
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f)); ImGui::SetCursorPosY(ImGui::GetCursorPosY() + LayoutScale(10.0f));
if (MenuButtonWithoutSummary(ok_text, true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(ok_text, true, LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
@ -2080,36 +2178,10 @@ bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summa
bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summary, float* value, float min, float max, bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summary, float* value, float min, float max,
float increment, const char* format /* = "%f" */, bool enabled /* = true */, float increment, const char* format /* = "%f" */, bool enabled /* = true */,
float height /* = LAYOUT_MENU_BUTTON_HEIGHT */, std::string_view ok_text /* = "OK" */) std::string_view ok_text /* = "OK" */)
{ {
ImRect bb; const SmallString value_text = SmallString::from_sprintf(format, *value);
bool visible, hovered; if (MenuButtonWithValue(title, summary, value_text, enabled))
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb);
if (!visible)
return false;
SmallString value_text = SmallString::from_sprintf(format, *value);
const ImVec2 value_size = UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, FLT_MAX, 0.0f,
IMSTR_START_END(value_text));
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const float text_end = bb.Max.x - value_size.x;
const ImRect title_bb(bb.Min, ImVec2(text_end, midpoint));
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), ImVec2(text_end, bb.Max.y));
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0f, 0.0f), 0.0f, &title_bb);
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.Min, bb.Max,
ImGui::GetColorU32(color), value_text, &value_size, ImVec2(1.0f, 0.5f), 0.0f, &bb);
if (!summary.empty())
{
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr,
ImVec2(0.0f, 0.0f), 0.0f, &summary_bb);
}
if (pressed)
OpenFixedPopupDialog(title); OpenFixedPopupDialog(title);
bool changed = false; bool changed = false;
@ -2130,10 +2202,8 @@ bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summa
ImGui::PopStyleVar(2); ImGui::PopStyleVar(2);
if (MenuButtonWithoutSummary(ok_text, true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, LAYOUT_CENTER_ALIGN_TEXT)) if (MenuButtonWithoutSummary(ok_text, true, LAYOUT_CENTER_ALIGN_TEXT))
{
CloseFixedPopupDialog(); CloseFixedPopupDialog();
}
EndMenuButtons(); EndMenuButtons();
@ -2143,44 +2213,11 @@ bool ImGuiFullscreen::RangeButton(std::string_view title, std::string_view summa
return changed; return changed;
} }
bool ImGuiFullscreen::MenuButtonWithValue(std::string_view title, std::string_view summary, std::string_view value,
bool enabled /* = true */, float height /* = LAYOUT_MENU_BUTTON_HEIGHT */)
{
ImRect bb;
bool visible, hovered;
bool pressed = MenuButtonFrame(title, enabled, height, &visible, &hovered, &bb);
if (!visible)
return false;
const ImVec2 value_size =
UIStyle.Font->CalcTextSizeA(UIStyle.LargeFontSize, UIStyle.BoldFontWeight, FLT_MAX, 0.0f, IMSTR_START_END(value));
const float midpoint = bb.Min.y + UIStyle.LargeFontSize + LayoutScale(4.0f);
const float text_end = bb.Max.x - value_size.x;
const ImRect title_bb(bb.Min, ImVec2(text_end, midpoint));
const ImVec4& color = ImGui::GetStyle().Colors[enabled ? ImGuiCol_Text : ImGuiCol_TextDisabled];
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, title_bb.Min, title_bb.Max,
ImGui::GetColorU32(color), title, nullptr, ImVec2(0.0f, 0.0f), 0.0f, &title_bb);
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, bb.Min, bb.Max,
ImGui::GetColorU32(color), value, nullptr, ImVec2(1.0f, 0.5f), 0.0f, &bb);
if (!summary.empty())
{
const ImRect summary_bb(ImVec2(bb.Min.x, midpoint), ImVec2(text_end, bb.Max.y));
RenderShadowedTextClipped(UIStyle.Font, UIStyle.MediumFontSize, UIStyle.NormalFontWeight, summary_bb.Min,
summary_bb.Max, ImGui::GetColorU32(DarkerColor(color)), summary, nullptr,
ImVec2(0.0f, 0.0f), 0.0f, &summary_bb);
}
return pressed;
}
bool ImGuiFullscreen::EnumChoiceButtonImpl(std::string_view title, std::string_view summary, s32* value_pointer, bool ImGuiFullscreen::EnumChoiceButtonImpl(std::string_view title, std::string_view summary, s32* value_pointer,
const char* (*to_display_name_function)(s32 value, void* opaque), const char* (*to_display_name_function)(s32 value, void* opaque),
void* opaque, u32 count, bool enabled, float height) void* opaque, u32 count, bool enabled)
{ {
const bool pressed = const bool pressed = MenuButtonWithValue(title, summary, to_display_name_function(*value_pointer, opaque), enabled);
MenuButtonWithValue(title, summary, to_display_name_function(*value_pointer, opaque), enabled, height);
if (pressed) if (pressed)
{ {
@ -2962,23 +2999,17 @@ void ImGuiFullscreen::FileSelectorDialog::Draw()
bool directory_selected = false; bool directory_selected = false;
if (!m_current_directory.empty()) if (!m_current_directory.empty())
{ MenuButtonWithoutSummary(SmallString::from_format(ICON_FA_FOLDER_OPEN " {}", m_current_directory), false);
MenuButton(SmallString::from_format(ICON_FA_FOLDER_OPEN " {}", m_current_directory), std::string_view(), false,
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY);
}
if (m_is_directory && !m_current_directory.empty()) if (m_is_directory && !m_current_directory.empty())
{ {
if (MenuButton(ICON_FA_FOLDER_PLUS " <Use This Directory>", std::string_view(), true, if (MenuButtonWithoutSummary(ICON_FA_FOLDER_PLUS " <Use This Directory>"))
LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY))
{
directory_selected = true; directory_selected = true;
}
} }
for (Item& item : m_items) for (Item& item : m_items)
{ {
if (MenuButton(item.display_name, std::string_view(), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY)) if (MenuButtonWithoutSummary(item.display_name))
selected = &item; selected = &item;
} }
@ -3063,14 +3094,17 @@ void ImGuiFullscreen::ChoiceDialog::Draw()
return; return;
const float width = LayoutScale(600.0f); const float width = LayoutScale(600.0f);
const float title_height = const float window_y_padding = LayoutScale(10.0f);
UIStyle.LargeFontSize + (LayoutScale(LAYOUT_MENU_BUTTON_Y_PADDING) * 2.0f) + (LayoutScale(10.0f) * 2.0f); const float title_height = UIStyle.LargeFontSize + (LayoutScale(LAYOUT_MENU_BUTTON_Y_PADDING) * 2.0f);
const float item_height =
(LayoutScale(LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY) + (LayoutScale(LAYOUT_MENU_BUTTON_Y_PADDING) * 2.0f) + // assume single item line height for precalculation
LayoutScale(LAYOUT_MENU_BUTTON_SPACING)); const float item_spacing = LayoutScale(LAYOUT_MENU_BUTTON_SPACING);
const float height = title_height + (item_height * static_cast<float>(std::min<size_t>(9, m_options.size()))); const float item_height = MenuButtonBounds::GetSingleLineHeight() + item_spacing;
const float height = title_height +
((item_height * static_cast<float>(std::min<size_t>(9, m_options.size()))) - item_spacing) +
(window_y_padding * 2.0f);
if (!BeginRender(LayoutScale(10.0f), LayoutScale(20.0f), ImVec2(width, height))) if (!BeginRender(window_y_padding, LayoutScale(20.0f), ImVec2(width, height)))
{ {
const ChoiceDialogCallback callback = std::move(m_callback); const ChoiceDialogCallback callback = std::move(m_callback);
ClearState(); ClearState();
@ -3092,7 +3126,7 @@ void ImGuiFullscreen::ChoiceDialog::Draw()
const SmallString title = const SmallString title =
SmallString::from_format("{0} {1}", option.second ? ICON_FA_SQUARE_CHECK : ICON_FA_SQUARE, option.first); SmallString::from_format("{0} {1}", option.second ? ICON_FA_SQUARE_CHECK : ICON_FA_SQUARE, option.first);
if (MenuButton(title, std::string_view(), true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY)) if (MenuButtonWithoutSummary(title))
{ {
choice = i; choice = i;
option.second = !option.second; option.second = !option.second;
@ -3103,24 +3137,31 @@ void ImGuiFullscreen::ChoiceDialog::Draw()
} }
else else
{ {
// draw background first, because otherwise it'll obscure the frame border // frame padding is needed for MenuButtonBounds()
bool found_selected = false; BeginMenuButtons(0, 0.0f, LAYOUT_MENU_BUTTON_X_PADDING, LAYOUT_MENU_BUTTON_Y_PADDING, 0.0f,
for (s32 i = 0; i < static_cast<s32>(m_options.size()); i++) LAYOUT_MENU_BUTTON_SPACING, false);
if (std::any_of(m_options.begin(), m_options.end(), [](const auto& it) { return it.second; }))
{ {
const auto& option = m_options[i]; // draw background first, because otherwise it'll obscure the frame border
if (!option.second) ImVec2 pos = ImGui::GetCurrentWindowRead()->DC.CursorPos;
continue; for (s32 i = 0; i < static_cast<s32>(m_options.size()); i++)
{
ImVec2 pos, size; const auto& option = m_options[i];
GetMenuButtonFrameBounds(LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, &pos, &size); const MenuButtonBounds bb(option.first, ImVec2(), {});
pos.y += (size.y + ImGui::GetStyle().ItemSpacing.y) * static_cast<float>(i); if (!option.second)
ImGui::RenderFrame(pos, pos + size, ImGui::GetColorU32(UIStyle.PrimaryColor), false, {
LayoutScale(MENU_ITEM_BORDER_ROUNDING)); pos.y += bb.frame_bb.GetHeight() + ImGui::GetStyle().ItemSpacing.y;
if (!found_selected) continue;
found_selected = true; }
ImGui::RenderFrame(pos, pos + bb.frame_bb.GetSize(), ImGui::GetColorU32(UIStyle.PrimaryColor), false,
LayoutScale(MENU_ITEM_BORDER_ROUNDING));
break;
}
} }
BeginMenuButtons(); PrerenderMenuButtonBorder();
ResetFocusHere(); ResetFocusHere();
const bool appearing = ImGui::IsWindowAppearing(); const bool appearing = ImGui::IsWindowAppearing();
@ -3129,9 +3170,7 @@ void ImGuiFullscreen::ChoiceDialog::Draw()
{ {
auto& option = m_options[i]; auto& option = m_options[i];
if (option.second ? if (option.second ? MenuButtonWithValue(option.first, {}, ICON_FA_CHECK) : MenuButtonWithoutSummary(option.first))
MenuButtonWithValue(option.first, {}, ICON_FA_CHECK, true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY) :
MenuButtonWithoutSummary(option.first))
{ {
choice = i; choice = i;
for (s32 j = 0; j < static_cast<s32>(m_options.size()); j++) for (s32 j = 0; j < static_cast<s32>(m_options.size()); j++)
@ -3332,8 +3371,7 @@ void ImGuiFullscreen::MessageDialog::Draw()
for (s32 button_index = 0; button_index < static_cast<s32>(m_buttons.size()); button_index++) for (s32 button_index = 0; button_index < static_cast<s32>(m_buttons.size()); button_index++)
{ {
if (!m_buttons[button_index].empty() && if (!m_buttons[button_index].empty() &&
MenuButtonWithoutSummary(m_buttons[button_index], true, LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, MenuButtonWithoutSummary(m_buttons[button_index], true, LAYOUT_CENTER_ALIGN_TEXT))
LAYOUT_CENTER_ALIGN_TEXT))
{ {
result = button_index; result = button_index;
} }

37
src/util/imgui_fullscreen.h
Unescape Escape View File

@ -40,7 +40,7 @@ static constexpr float LAYOUT_MENU_BUTTON_HEIGHT = 50.0f;
static constexpr float LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY = 26.0f; static constexpr float LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY = 26.0f;
static constexpr float LAYOUT_MENU_BUTTON_X_PADDING = 15.0f; static constexpr float LAYOUT_MENU_BUTTON_X_PADDING = 15.0f;
static constexpr float LAYOUT_MENU_BUTTON_Y_PADDING = 10.0f; static constexpr float LAYOUT_MENU_BUTTON_Y_PADDING = 10.0f;
static constexpr float LAYOUT_MENU_BUTTON_SPACING = 4.0f; static constexpr float LAYOUT_MENU_BUTTON_SPACING = 6.0f;
static constexpr float LAYOUT_MENU_WINDOW_X_PADDING = 12.0f; static constexpr float LAYOUT_MENU_WINDOW_X_PADDING = 12.0f;
static constexpr float LAYOUT_MENU_WINDOW_Y_PADDING = 12.0f; static constexpr float LAYOUT_MENU_WINDOW_Y_PADDING = 12.0f;
static constexpr float LAYOUT_FOOTER_PADDING = 10.0f; static constexpr float LAYOUT_FOOTER_PADDING = 10.0f;
@ -275,8 +275,8 @@ void DrawFullscreenFooter();
void PrerenderMenuButtonBorder(); void PrerenderMenuButtonBorder();
void BeginMenuButtons(u32 num_items = 0, float y_align = 0.0f, float x_padding = LAYOUT_MENU_BUTTON_X_PADDING, void BeginMenuButtons(u32 num_items = 0, float y_align = 0.0f, float x_padding = LAYOUT_MENU_BUTTON_X_PADDING,
float y_padding = LAYOUT_MENU_BUTTON_Y_PADDING, float item_height = LAYOUT_MENU_BUTTON_HEIGHT, float y_padding = LAYOUT_MENU_BUTTON_Y_PADDING, float x_spacing = 0.0f,
float x_spacing = 0.0f, float y_spacing = LAYOUT_MENU_BUTTON_SPACING); float y_spacing = LAYOUT_MENU_BUTTON_SPACING, bool prerender_frame = true);
void EndMenuButtons(); void EndMenuButtons();
void GetMenuButtonFrameBounds(float height, ImVec2* pos, ImVec2* size); void GetMenuButtonFrameBounds(float height, ImVec2* pos, ImVec2* size);
bool MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered, ImVec2* min, bool MenuButtonFrame(std::string_view str_id, bool enabled, float height, bool* visible, bool* hovered, ImVec2* min,
@ -299,36 +299,31 @@ void TextAlignedMultiLine(float align_x, const char* text, const char* text_end
void MenuHeading(std::string_view title, bool draw_line = true); void MenuHeading(std::string_view title, bool draw_line = true);
bool MenuHeadingButton(std::string_view title, std::string_view value = {}, bool enabled = true, bool draw_line = true); bool MenuHeadingButton(std::string_view title, std::string_view value = {}, bool enabled = true, bool draw_line = true);
bool MenuButton(std::string_view title, std::string_view summary, bool enabled = true, bool MenuButton(std::string_view title, std::string_view summary, bool enabled = true,
float height = LAYOUT_MENU_BUTTON_HEIGHT, const ImVec2& text_align = ImVec2(0.0f, 0.0f)); const ImVec2& text_align = ImVec2(0.0f, 0.0f));
bool MenuButtonWithoutSummary(std::string_view title, bool enabled = true, bool MenuButtonWithoutSummary(std::string_view title, bool enabled = true,
float height = LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY,
const ImVec2& text_align = ImVec2(0.0f, 0.0f)); const ImVec2& text_align = ImVec2(0.0f, 0.0f));
bool MenuButtonWithValue(std::string_view title, std::string_view summary, std::string_view value, bool enabled = true, bool MenuButtonWithValue(std::string_view title, std::string_view summary, std::string_view value, bool enabled = true,
float height = LAYOUT_MENU_BUTTON_HEIGHT); const ImVec2& text_align = ImVec2(0.0f, 0.0f));
bool MenuImageButton(std::string_view title, std::string_view summary, ImTextureID user_texture_id, bool MenuImageButton(std::string_view title, std::string_view summary, ImTextureID user_texture_id,
const ImVec2& image_size, bool enabled = true, float height = LAYOUT_MENU_BUTTON_HEIGHT, const ImVec2& image_size, bool enabled = true, const ImVec2& uv0 = ImVec2(0.0f, 0.0f),
const ImVec2& uv0 = ImVec2(0.0f, 0.0f), const ImVec2& uv1 = ImVec2(1.0f, 1.0f)); const ImVec2& uv1 = ImVec2(1.0f, 1.0f));
bool FloatingButton(std::string_view text, float x, float y, float width = -1.0f, bool FloatingButton(std::string_view text, float x, float y, float anchor_x = 0.0f, float anchor_y = 0.0f,
float height = LAYOUT_MENU_BUTTON_HEIGHT_NO_SUMMARY, float anchor_x = 0.0f, float anchor_y = 0.0f,
bool enabled = true, ImVec2* out_position = nullptr, bool repeat_button = false); bool enabled = true, ImVec2* out_position = nullptr, bool repeat_button = false);
bool ToggleButton(std::string_view title, std::string_view summary, bool* v, bool enabled = true, bool ToggleButton(std::string_view title, std::string_view summary, bool* v, bool enabled = true);
float height = LAYOUT_MENU_BUTTON_HEIGHT); bool ThreeWayToggleButton(std::string_view title, std::string_view summary, std::optional<bool>* v,
bool ThreeWayToggleButton(std::string_view title, std::string_view summary, std::optional<bool>* v, bool enabled = true, bool enabled = true);
float height = LAYOUT_MENU_BUTTON_HEIGHT);
bool RangeButton(std::string_view title, std::string_view summary, s32* value, s32 min, s32 max, s32 increment, bool RangeButton(std::string_view title, std::string_view summary, s32* value, s32 min, s32 max, s32 increment,
const char* format = "%d", bool enabled = true, float height = LAYOUT_MENU_BUTTON_HEIGHT, const char* format = "%d", bool enabled = true, std::string_view ok_text = "OK");
std::string_view ok_text = "OK");
bool RangeButton(std::string_view title, std::string_view summary, float* value, float min, float max, float increment, bool RangeButton(std::string_view title, std::string_view summary, float* value, float min, float max, float increment,
const char* format = "%f", bool enabled = true, float height = LAYOUT_MENU_BUTTON_HEIGHT, const char* format = "%f", bool enabled = true, std::string_view ok_text = "OK");
std::string_view ok_text = "OK");
bool EnumChoiceButtonImpl(std::string_view title, std::string_view summary, s32* value_pointer, bool EnumChoiceButtonImpl(std::string_view title, std::string_view summary, s32* value_pointer,
const char* (*to_display_name_function)(s32 value, void* opaque), void* opaque, u32 count, const char* (*to_display_name_function)(s32 value, void* opaque), void* opaque, u32 count,
bool enabled, float height); bool enabled);
template<typename DataType, typename CountType> template<typename DataType, typename CountType>
ALWAYS_INLINE static bool EnumChoiceButton(std::string_view title, std::string_view summary, DataType* value_pointer, ALWAYS_INLINE static bool EnumChoiceButton(std::string_view title, std::string_view summary, DataType* value_pointer,
const char* (*to_display_name_function)(DataType value), CountType count, const char* (*to_display_name_function)(DataType value), CountType count,
bool enabled = true, float height = LAYOUT_MENU_BUTTON_HEIGHT) bool enabled = true)
{ {
s32 value = static_cast<s32>(*value_pointer); s32 value = static_cast<s32>(*value_pointer);
auto to_display_name_wrapper = [](s32 value, void* opaque) -> const char* { auto to_display_name_wrapper = [](s32 value, void* opaque) -> const char* {
@ -336,7 +331,7 @@ ALWAYS_INLINE static bool EnumChoiceButton(std::string_view title, std::string_v
}; };
if (EnumChoiceButtonImpl(title, summary, &value, to_display_name_wrapper, &to_display_name_function, if (EnumChoiceButtonImpl(title, summary, &value, to_display_name_wrapper, &to_display_name_function,
static_cast<u32>(count), enabled, height)) static_cast<u32>(count), enabled))
{ {
*value_pointer = static_cast<DataType>(value); *value_pointer = static_cast<DataType>(value);
return true; return true;

Write Preview
Loading…
Cancel
Save