New UI7Menu Api, Scrolling in Menus (on tusch screen), small fixes

This commit is contained in:
2024-05-20 16:58:52 +02:00
parent 17c36bb05e
commit 66337e0f6e
6 changed files with 124 additions and 84 deletions

View File

@ -61,8 +61,8 @@ inline void End(std::string group, std::string func_name) {
std::string trace_id = scomb(group, func_name);
rd7_traces[trace_id].time_end = svcGetSystemTick();
rd7_traces[trace_id].time_of = static_cast<float>(
rd7_traces[trace_id].time_end / (float)TICKS_PER_MSEC -
rd7_traces[trace_id].time_start / (float)TICKS_PER_MSEC);
((float)rd7_traces[trace_id].time_end / (float)TICKS_PER_MSEC) -
((float)rd7_traces[trace_id].time_start / (float)TICKS_PER_MSEC));
}
} // namespace Ftrace
} // namespace RenderD7

View File

@ -32,6 +32,7 @@ enum UI7MenuFlags_ {
UI7MenuFlags_None = 0,
UI7MenuFlags_NoTitlebar = UI7MAKEFLAG(0),
UI7MenuFlags_TitleMid = UI7MAKEFLAG(1),
UI7MenuFlags_ForceScrolling = MAKEFLAG(2),
};
namespace UI7 {
@ -70,4 +71,5 @@ R7Vec2 GetCursorPos();
void SetCursorPos(R7Vec2 cp);
void RestoreCursor();
void SameLine();
float GetScrollingOffset();
} // namespace UI7

View File

@ -98,12 +98,10 @@ class RSettings : public RenderD7::Scene {
/// @brief State (Define for Menus)
enum RState {
RSETTINGS, // Main Settings Menu
RINFO,
RIDB, // Internal Debugger
ROVERLAYS,
RFTRACE, // FTRace Menu
RUI7, // UI7 Menu
RCREDITS // Unused?
RIDB, // Internal Debugger
ROVERLAYS, // Overlay Settings
RFTRACE, // FTRace Menu
RUI7, // UI7 Menu
};
/// @param shared_request Defines requests from Draw to Logic