Switch over to Universal-Core. (#18)

* Don't build here.

* WIP: Switch to Universal-Core.

* Update Submodule repo & azure-pipelines.
This commit is contained in:
StackZ
2020-02-08 06:20:50 +01:00
committed by GitHub
parent 0ef5d2c5ab
commit 09be8e0b94
55 changed files with 1064 additions and 1327 deletions
+7 -10
View File
@@ -24,13 +24,10 @@
* reasonable ways as different from the original version.
*/
#include "utils/fileBrowse.hpp"
#include "keyboard.hpp"
#include "logging.hpp"
#include "screens/scriptCreator.hpp"
#include "utils/config.hpp"
#include "utils/fileBrowse.h"
#include "scriptCreator.hpp"
#include <fstream>
#include <unistd.h>
@@ -80,14 +77,14 @@ void ScriptCreator::Draw(void) const {
}
void ScriptCreator::DrawSubMenu(void) const {
Gui::DrawTop();
GFX::DrawTop();
if (Config::UseBars == true) {
Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, Lang::get("SCRIPTCREATOR"), 400);
} else {
Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, Lang::get("SCRIPTCREATOR"), 400);
}
Gui::DrawBottom();
GFX::DrawBottom();
for (int i = 0; i < 2; i++) {
if (Selection == i) {
@@ -102,14 +99,14 @@ void ScriptCreator::DrawSubMenu(void) const {
}
void ScriptCreator::DrawScriptScreen(void) const {
Gui::DrawTop();
GFX::DrawTop();
if (Config::UseBars == true) {
Gui::DrawStringCentered(0, 0, 0.7f, Config::TxtColor, "Selected Entry: " + entryName, 400);
} else {
Gui::DrawStringCentered(0, 2, 0.7f, Config::TxtColor, "Selected Entry: " + entryName, 400);
}
Gui::DrawBottom();
GFX::DrawBottom();
// Draw Page.
for (int i = 0; i < 2; i++) {
@@ -287,7 +284,7 @@ void ScriptCreator::setInfoStuff(void) {
void ScriptCreator::SubMenuLogic(u32 hDown, u32 hHeld, touchPosition touch) {
if (hDown & KEY_B) {
Screen::back();
Gui::screenBack();
return;
}