AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 18:24:55 +00:00
Code Issues Projects Releases Wiki Activity

Updates for Menu

Browse Source
This commit is contained in:
Jack Andersen
2016-01-15 13:35:59 -10:00
parent 399a48ece3
commit 342fc4a00c
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,2 +1,3 @@
version.h version.h
*.user *.user
.DS_Store

5
Editor/SplashScreen.cpp
View File

@@ -53,6 +53,9 @@ void SplashScreen::think()
if (m_fileBrowser.m_view) if (m_fileBrowser.m_view)
m_fileBrowser.m_view->think(); m_fileBrowser.m_view->think();
if (m_openButt.m_view)
m_openButt.m_view->think();
if (m_newProjBind.m_deferPath.size()) if (m_newProjBind.m_deferPath.size())
{ {
Log.report(LogVisor::Info, _S("Making project '%s'"), m_newProjBind.m_deferPath.c_str()); 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(); Specter::ViewResources& res = rootView().viewRes();
if (!m_title && res.fontCacheReady()) if (!m_title && res.fontCacheReady())
{ {
m_title.reset(new Specter::TextView(res, *this, res.m_titleFont)); m_title.reset(new Specter::TextView(res, *this, res.m_titleFont));
Zeus::CColor clearColor = res.themeData().uiText(); Zeus::CColor clearColor = res.themeData().uiText();
clearColor[3] = 0.0; clearColor[3] = 0.0;

1
Editor/ViewManager.cpp
View File

@@ -36,7 +36,6 @@ void ViewManager::RootSpaceViewBuilt(Specter::View *view)
std::vector<Specter::View*>& cViews = m_rootView->accessContentViews(); std::vector<Specter::View*>& cViews = m_rootView->accessContentViews();
cViews.clear(); cViews.clear();
cViews.push_back(view); cViews.push_back(view);
printf("RootView Set: %p [%p]\n\n", m_rootView.get(), view);
cViews.push_back(m_splash.get()); cViews.push_back(m_splash.get());
m_rootView->updateSize(); m_rootView->updateSize();
} }

2
Editor/ViewManager.hpp
View File

@@ -29,7 +29,7 @@ class ViewManager : public Specter::IViewManager
std::unique_ptr<RootSpace> m_rootSpace; std::unique_ptr<RootSpace> m_rootSpace;
Specter::View* m_rootSpaceView = nullptr; Specter::View* m_rootSpaceView = nullptr;
std::vector<HECL::SystemString> m_recentProjects; std::vector<HECL::SystemString> m_recentProjects = {"Test", "One", "Two", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j"};
std::vector<HECL::SystemString> m_recentFiles; std::vector<HECL::SystemString> m_recentFiles;
bool m_updatePf = false; bool m_updatePf = false;

2
hecl

Submodule hecl updated: 5d0c80b9e6...02236f0448

2
libSpecter

Submodule libSpecter updated: 2490aa3bb8...c0cc30bca0