From 7ccefe6d40107f091275d5019d8de88373ef0a2e Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sat, 5 Nov 2022 14:50:35 -0500 Subject: [PATCH] GUI: more Android fixes --- src/gui/orders.cpp | 8 ++++++++ src/gui/util.cpp | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/gui/orders.cpp b/src/gui/orders.cpp index 826df20f..a82dcc25 100644 --- a/src/gui/orders.cpp +++ b/src/gui/orders.cpp @@ -29,6 +29,14 @@ void FurnaceGUI::drawOrders() { nextWindow=GUI_WINDOW_NOTHING; } if (!ordersOpen) return; + if (mobileUI) { + patWindowPos=(portrait?ImVec2(0.0f,(mobileMenuPos*-0.65*canvasH)):ImVec2((0.16*canvasH)+0.5*canvasW*mobileMenuPos,0.0f)); + patWindowSize=(portrait?ImVec2(canvasW,canvasH-(0.16*canvasW)):ImVec2(canvasW-(0.16*canvasH),canvasH)); + ImGui::SetNextWindowPos(patWindowPos); + ImGui::SetNextWindowSize(patWindowSize); + } else { + //ImGui::SetNextWindowSizeConstraints(ImVec2(440.0f*dpiScale,400.0f*dpiScale),ImVec2(canvasW,canvasH)); + } if (ImGui::Begin("Orders",&ordersOpen,globalWinFlags)) { float regionX=ImGui::GetContentRegionAvail().x; ImVec2 prevSpacing=ImGui::GetStyle().ItemSpacing; diff --git a/src/gui/util.cpp b/src/gui/util.cpp index 2bbf2876..3998f2bb 100644 --- a/src/gui/util.cpp +++ b/src/gui/util.cpp @@ -32,6 +32,15 @@ #endif String getHomeDir() { +#ifdef IS_MOBILE + +#ifdef ANDROID + return "/storage/emulated/0/"; +#else + return "/"; +#endif + +#else String ret; char tempDir[4096]; @@ -73,6 +82,7 @@ String getHomeDir() { } return ret; +#endif } String getKeyName(int key, bool emptyNone) { @@ -101,4 +111,4 @@ String getKeyName(int key, bool emptyNone) { ret+=name; } return ret; -} \ No newline at end of file +}