From 25747503cc959b8592f66ea10daf1b9ea10f6b71 Mon Sep 17 00:00:00 2001 From: sinaioutlander <49360850+sinaioutlander@users.noreply.github.com> Date: Sat, 24 Oct 2020 00:41:55 +1100 Subject: [PATCH] Implemented PageHandler proof of concept, fixed something with scrollviews --- src/Explorer.csproj | 1 + src/UI/Main/MainMenu.cs | 19 ++--- src/UI/Main/Pages/HomePage.cs | 34 ++++++-- src/UI/Shared/PageHandler.cs | 155 ++++++++++++++++++++++++++++++++++ src/UI/UIFactory.cs | 12 ++- 5 files changed, 202 insertions(+), 19 deletions(-) create mode 100644 src/UI/Shared/PageHandler.cs diff --git a/src/Explorer.csproj b/src/Explorer.csproj index da0d6dc..f7bc8ae 100644 --- a/src/Explorer.csproj +++ b/src/Explorer.csproj @@ -240,6 +240,7 @@ + diff --git a/src/UI/Main/MainMenu.cs b/src/UI/Main/MainMenu.cs index e5e0f43..a328d41 100644 --- a/src/UI/Main/MainMenu.cs +++ b/src/UI/Main/MainMenu.cs @@ -65,8 +65,12 @@ namespace ExplorerBeta.UI.Main if (m_activePage == page || page == null) return; + m_activePage?.Content?.SetActive(false); + m_activePage = page; + m_activePage.Content?.SetActive(true); + var button = page.RefNavbarButton; var colors = button.colors; @@ -87,16 +91,7 @@ namespace ExplorerBeta.UI.Main #region UI Interaction Callbacks - private void OnPressHide() - { - ExplorerCore.ShowMenu = false; - } - - private void OnNavButtonPressed(BaseMenuPage page) - { - ExplorerCore.Log($"Pressed '{page.Name}'"); - SetPage(page); - } + // ... none needed yet #endregion @@ -159,7 +154,7 @@ namespace ExplorerBeta.UI.Main var hideBtnObj = UIFactory.CreateButton(titleBar); var hideBtn = hideBtnObj.GetComponent