From 342fc4a00ce9e9d4e45e3e1fc2efaf13b87d60fb Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Fri, 15 Jan 2016 13:35:59 -1000 Subject: [PATCH] Updates for Menu --- .gitignore | 1 + Editor/SplashScreen.cpp | 5 ++++- Editor/ViewManager.cpp | 1 - Editor/ViewManager.hpp | 2 +- hecl | 2 +- libSpecter | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index dca2e8836..c138894b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ version.h *.user +.DS_Store diff --git a/Editor/SplashScreen.cpp b/Editor/SplashScreen.cpp index 4d4e0ab0a..4320ab179 100644 --- a/Editor/SplashScreen.cpp +++ b/Editor/SplashScreen.cpp @@ -53,6 +53,9 @@ void SplashScreen::think() if (m_fileBrowser.m_view) m_fileBrowser.m_view->think(); + if (m_openButt.m_view) + m_openButt.m_view->think(); + if (m_newProjBind.m_deferPath.size()) { Log.report(LogVisor::Info, _S("Making project '%s'"), m_newProjBind.m_deferPath.c_str()); @@ -78,7 +81,7 @@ void SplashScreen::updateContentOpacity(float opacity) Specter::ViewResources& res = rootView().viewRes(); if (!m_title && res.fontCacheReady()) - { + { m_title.reset(new Specter::TextView(res, *this, res.m_titleFont)); Zeus::CColor clearColor = res.themeData().uiText(); clearColor[3] = 0.0; diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 8aa87fd01..e3a90daa7 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -36,7 +36,6 @@ void ViewManager::RootSpaceViewBuilt(Specter::View *view) std::vector& cViews = m_rootView->accessContentViews(); cViews.clear(); cViews.push_back(view); - printf("RootView Set: %p [%p]\n\n", m_rootView.get(), view); cViews.push_back(m_splash.get()); m_rootView->updateSize(); } diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index 1861a99c6..608916719 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -29,7 +29,7 @@ class ViewManager : public Specter::IViewManager std::unique_ptr m_rootSpace; Specter::View* m_rootSpaceView = nullptr; - std::vector m_recentProjects; + std::vector m_recentProjects = {"Test", "One", "Two", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j"}; std::vector m_recentFiles; bool m_updatePf = false; diff --git a/hecl b/hecl index 5d0c80b9e..02236f044 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 5d0c80b9e603ecb2762b281d8736d21a324c3e76 +Subproject commit 02236f04488aee598ee268a6aefbdfb9e56bb98c diff --git a/libSpecter b/libSpecter index 2490aa3bb..c0cc30bca 160000 --- a/libSpecter +++ b/libSpecter @@ -1 +1 @@ -Subproject commit 2490aa3bb82860fa2969d2cc797324d846e3b51c +Subproject commit c0cc30bca09e92b0c8e566016334c162c459f9dc