diff --git a/Editor/SplashScreen.hpp b/Editor/SplashScreen.hpp index cd98df120..ce37239ef 100644 --- a/Editor/SplashScreen.hpp +++ b/Editor/SplashScreen.hpp @@ -42,10 +42,11 @@ class SplashScreen : public Specter::ModalWindow m_splash.m_fileBrowser.m_view.reset( new Specter::FileBrowser(m_splash.rootView().viewRes(), m_splash, m_splash.m_newString, - Specter::FileBrowser::Type::SaveFile, - [](bool, const HECL::SystemString& path) + Specter::FileBrowser::Type::SaveDirectory, + [](bool ok, const HECL::SystemString& path) { - Log.report(LogVisor::Info, _S("Making project '%s'"), path.c_str()); + if (ok) + Log.report(LogVisor::Info, _S("Making project '%s'"), path.c_str()); })); m_splash.updateSize(); m_splash.m_newButt.mouseLeave(coord); @@ -64,9 +65,10 @@ class SplashScreen : public Specter::ModalWindow new Specter::FileBrowser(m_splash.rootView().viewRes(), m_splash, m_splash.m_openString, Specter::FileBrowser::Type::OpenHECLProject, - [](bool, const HECL::SystemString& path) + [](bool ok, const HECL::SystemString& path) { - Log.report(LogVisor::Info, _S("Opening project '%s'"), path.c_str()); + if (ok) + Log.report(LogVisor::Info, _S("Opening project '%s'"), path.c_str()); })); m_splash.updateSize(); m_splash.m_openButt.mouseLeave(coord); @@ -85,9 +87,10 @@ class SplashScreen : public Specter::ModalWindow new Specter::FileBrowser(m_splash.rootView().viewRes(), m_splash, m_splash.m_extractString, Specter::FileBrowser::Type::OpenFile, - [](bool, const HECL::SystemString& path) + [](bool ok, const HECL::SystemString& path) { - Log.report(LogVisor::Info, _S("Extracting game '%s'"), path.c_str()); + if (ok) + Log.report(LogVisor::Info, _S("Extracting game '%s'"), path.c_str()); })); m_splash.updateSize(); m_splash.m_extractButt.mouseLeave(coord); diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index feaef171c..2f1d9000f 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -45,7 +45,7 @@ public: const char* help() const {return "Sets scale factor to 1.0";} void activated(const boo::SWindowCoord& coord) { - m_vm.RequestPixelFactor(1.0); + m_vm.requestPixelFactor(1.0); } }; SetTo1 m_setTo1; @@ -59,7 +59,7 @@ public: const char* help() const {return "Sets scale factor to 2.0";} void activated(const boo::SWindowCoord& coord) { - m_vm.RequestPixelFactor(2.0); + m_vm.requestPixelFactor(2.0); } }; SetTo2 m_setTo2; @@ -72,7 +72,7 @@ public: ~ViewManager(); Specter::RootView& rootView() const {return *m_rootView;} - void RequestPixelFactor(float pf) + void requestPixelFactor(float pf) { m_reqPf = pf; m_updatePf = true; diff --git a/hecl b/hecl index ad8fe7018..ca39b6420 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit ad8fe70182557d4e09d91dce0a10870124b83fd3 +Subproject commit ca39b64201938f45b9a8550f057de09d9824d12c diff --git a/libSpecter b/libSpecter index 00cf6c8e7..7f1ed824a 160000 --- a/libSpecter +++ b/libSpecter @@ -1 +1 @@ -Subproject commit 00cf6c8e7ac037cdf49e048883f0a8e4936d9e8d +Subproject commit 7f1ed824a6200a6e6478180c8ea729abc758006b