Commitd950213

committed

feat(UI - Grand Prix Timer): Allows moving the timer

1 parent1c2af0c commitd950213Copy full SHA for d950213

File tree

+49

-3

lines changed

+49

-3

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,8 @@ namespace base`
`81`	`81`	`staticvoidgame(CTRPluginFramework::MenuEntry *);`
`82`	`82`	`staticvoidmenu(CTRPluginFramework::MenuEntry *);`
`83`	`83`	`};`
	`84`	`+`
	`85`	`+staticvoidgrand_prix_timer_menu(CTRPluginFramework::MenuEntry *);`
`84`	`86`	`};`
`85`	`87`
`86`	`88`	`#ifdef _DEBUG`

Lines changed: 7 additions & 0 deletions

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+#include<base/entries.hpp>`
	`2`	`+`
	`3`	`+#include<base/settings.hpp>`
	`4`	`+`
	`5`	`+#include<format>`
	`6`	`+`
	`7`	`+namespacebase`
	`8`	`+{`
	`9`	`+voidentries::ui::grand_prix_timer_menu(CTRPluginFramework::MenuEntry *entry)`
	`10`	`+ {`
	`11`	`+auto keyboard =CTRPluginFramework::Keyboard(entry->Name());`
	`12`	`+ keyboard.DisplayTopScreen =true;`
	`13`	`+`
	`14`	`+auto &grand_prix_timer = g_settings.m_options.ui.grand_prix_timer;`
	`15`	`+`
	`16`	`+while (true)`
	`17`	`+ {`
	`18`	`+ keyboard.Populate(std::vector<std::string>`
	`19`	`+ {`
	`20`	`+std::format("X ({})", grand_prix_timer.x),`
	`21`	`+std::format("Y ({})", grand_prix_timer.y)`
	`22`	`+ });`
	`23`	`+`
	`24`	`+autoconst choice = keyboard.Open();`
	`25`	`+if (choice <0)`
	`26`	`+break;`
	`27`	`+`
	`28`	`+switch (choice)`
	`29`	`+ {`
	`30`	`+case0: keyboard.Open(grand_prix_timer.x, grand_prix_timer.x);break;`
	`31`	`+case1: keyboard.Open(grand_prix_timer.y, grand_prix_timer.y);break;`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+}`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`#include<base/menu.hpp>`
`4`	`4`	`#include<base/pointers.hpp>`
	`5`	`+#include<base/settings.hpp>`
`5`	`6`
`6`	`7`	`#include<Sequence/MenuData.hpp>`
`7`	`8`	`#include<Sequence/RacePage.hpp>`
`@@ -14,12 +15,13 @@ namespace base`
`14`	`15`	`{`
`15`	`16`	`if (g_menu->m_grand_prix_timer_entry->IsActivated())`
`16`	`17`	`{`
	`18`	`+autoconst &grand_prix_timer = g_settings.m_options.ui.grand_prix_timer;`
`17`	`19`	`autoconst &mode = System::g_root_system->get_menu_data()->m_base_race_page->m_mode;`
`18`	`20`	`if (mode ==0 \|\| mode ==2)// GrandPrix offline and online`
`19`	`21`	`{`
`20`	`22`	`autoconst pane = _this->getRootPane();`
`21`		`- pane->m_translate.x =-275.f;`
`22`		`- pane->m_translate.y =-205.f;`
	`23`	`+ pane->m_translate.x =grand_prix_timer.x;`
	`24`	`+ pane->m_translate.y =grand_prix_timer.y;`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ namespace base`
`72`	`72`
`73`	`73`	`m_save_data_modifier_entry(new MenuEntry("Save Data Modifier",nullptr, entries::system::save_data_modifier_game)),`
`74`	`74`
`75`		`-m_grand_prix_timer_entry(new MenuEntry("Grand Prix Timer", DEFAULT_ENTRY)),`
	`75`	`+m_grand_prix_timer_entry(new MenuEntry("Grand Prix Timer", DEFAULT_ENTRY, entries::ui::grand_prix_timer_menu)),`
`76`	`76`	`m_enhanced_minimap_entry(new MenuEntry("Enhanced Minimap", entries::ui::enhanced_minimap::game, entries::ui::enhanced_minimap::menu)),`
`77`	`77`	`m_mii_heads_entry(new MenuEntry("Mii Heads", entries::ui::mii_heads::game, entries::ui::mii_heads::menu)),`
`78`	`78`

Comments

(0)