archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-15 11:18:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

overlays: use array for progress bars

Browse source
This commit is contained in:
Megamouse 2023-02-18 10:05:10 +01:00
parent 23da770364
commit be49a80bc7
2 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

42
rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
View file

@ -30,10 +30,11 @@ namespace rsx
bottom_bar.set_size(1200, 2); bottom_bar.set_size(1200, 2);
bottom_bar.set_pos(40, 400); bottom_bar.set_pos(40, 400);
progress_1.set_size(800, 4); for (progress_bar& bar : progress_bars)
progress_2.set_size(800, 4); {
progress_1.back_color = color4f(0.25f, 0.f, 0.f, 0.85f); bar.set_size(800, 4);
progress_2.back_color = color4f(0.25f, 0.f, 0.f, 0.85f); bar.back_color = color4f(0.25f, 0.f, 0.f, 0.85f);
}
btn_ok.set_text(localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES); btn_ok.set_text(localized_string_id::RSX_OVERLAYS_MSG_DIALOG_YES);
btn_ok.set_size(140, 30); btn_ok.set_size(140, 30);
@ -84,12 +85,12 @@ namespace rsx
if (num_progress_bars > 0) if (num_progress_bars > 0)
{ {
result.add(progress_1.get_compiled()); result.add(::at32(progress_bars, 0).get_compiled());
} }
if (num_progress_bars > 1) if (num_progress_bars > 1)
{ {
result.add(progress_2.get_compiled()); result.add(::at32(progress_bars, 1).get_compiled());
} }
if (interactive) if (interactive)
@ -196,11 +197,11 @@ namespace rsx
if (num_progress_bars) if (num_progress_bars)
{ {
u16 offset = 58; u16 offset = 58;
progress_1.set_pos(240, 412); ::at32(progress_bars, 0).set_pos(240, 412);
if (num_progress_bars > 1) if (num_progress_bars > 1)
{ {
progress_2.set_pos(240, 462); ::at32(progress_bars, 1).set_pos(240, 462);
offset = 98; offset = 98;
} }
@ -414,10 +415,7 @@ namespace rsx
if (index >= num_progress_bars) if (index >= num_progress_bars)
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
if (index == 0) ::at32(progress_bars, index).set_text(msg);
progress_1.set_text(msg);
else
progress_2.set_text(msg);
return CELL_OK; return CELL_OK;
} }
@ -427,10 +425,7 @@ namespace rsx
if (index >= num_progress_bars) if (index >= num_progress_bars)
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
if (index == 0) ::at32(progress_bars, index).inc(value);
progress_1.inc(value);
else
progress_2.inc(value);
if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1) if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1)
Emu.GetCallbacks().handle_taskbar_progress(1, static_cast<s32>(value)); Emu.GetCallbacks().handle_taskbar_progress(1, static_cast<s32>(value));
@ -443,10 +438,7 @@ namespace rsx
if (index >= num_progress_bars) if (index >= num_progress_bars)
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
if (index == 0) ::at32(progress_bars, index).set_value(value);
progress_1.set_value(value);
else
progress_2.set_value(value);
if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1) if (index == static_cast<u32>(taskbar_index) || taskbar_index == -1)
Emu.GetCallbacks().handle_taskbar_progress(3, static_cast<s32>(value)); Emu.GetCallbacks().handle_taskbar_progress(3, static_cast<s32>(value));
@ -459,10 +451,7 @@ namespace rsx
if (index >= num_progress_bars) if (index >= num_progress_bars)
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
if (index == 0) ::at32(progress_bars, index).set_value(0.f);
progress_1.set_value(0.f);
else
progress_2.set_value(0.f);
Emu.GetCallbacks().handle_taskbar_progress(0, 0); Emu.GetCallbacks().handle_taskbar_progress(0, 0);
@ -474,10 +463,7 @@ namespace rsx
if (index >= num_progress_bars) if (index >= num_progress_bars)
return CELL_MSGDIALOG_ERROR_PARAM; return CELL_MSGDIALOG_ERROR_PARAM;
if (index == 0) ::at32(progress_bars, index).set_limit(static_cast<f32>(limit));
progress_1.set_limit(static_cast<f32>(limit));
else
progress_2.set_limit(static_cast<f32>(limit));
if (index == static_cast<u32>(taskbar_index)) if (index == static_cast<u32>(taskbar_index))
{ {

2
rpcs3/Emu/RSX/Overlays/overlay_message_dialog.h
View file

@ -16,7 +16,7 @@ namespace rsx
overlay_element bottom_bar, background; overlay_element bottom_bar, background;
image_view background_poster; image_view background_poster;
progress_bar progress_1, progress_2; std::array<progress_bar, 2> progress_bars{};
u8 num_progress_bars = 0; u8 num_progress_bars = 0;
s32 taskbar_index = 0; s32 taskbar_index = 0;
s32 taskbar_limit = 0; s32 taskbar_limit = 0;