AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update submodules

This commit is contained in:
Jack Andersen 2015-12-20 09:20:07 -10:00
parent 058581f49a
commit d92fd33cd4
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Editor/SplashScreen/SplashScreen.cpp
View File

@ -18,7 +18,10 @@ namespace RUDE
#define TEXT_MARGIN 10 #define TEXT_MARGIN 10
SplashScreen::SplashScreen(ViewManager& vm, Specter::ViewResources& res) SplashScreen::SplashScreen(ViewManager& vm, Specter::ViewResources& res)
: ModalWindow(res, vm.rootView(), SPLASH_WIDTH * res.pixelFactor(), SPLASH_HEIGHT * res.pixelFactor()), m_vm(vm), : ModalWindow(res, vm.rootView(),
Specter::RectangleConstraint(SPLASH_WIDTH * res.pixelFactor(),
SPLASH_HEIGHT * res.pixelFactor())),
m_vm(vm),
m_textColor(res.themeData().uiText()), m_textColor(res.themeData().uiText()),
m_textColorClear(m_textColor), m_textColorClear(m_textColor),
m_newProjBind(*this), m_newProjBind(*this),
@ -131,6 +134,35 @@ void SplashScreen::mouseLeave(const boo::SWindowCoord& coord)
} }
} }
void SplashScreen::scroll(const boo::SWindowCoord& coord, const boo::SScrollDelta& scroll)
{
if (m_fileBrowser.m_view)
m_fileBrowser.m_view->scroll(coord, scroll);
}
void SplashScreen::touchDown(const boo::STouchCoord& coord, uintptr_t tid)
{
if (m_fileBrowser.m_view)
m_fileBrowser.m_view->touchDown(coord, tid);
}
void SplashScreen::touchUp(const boo::STouchCoord& coord, uintptr_t tid)
{
if (m_fileBrowser.m_view)
m_fileBrowser.m_view->touchUp(coord, tid);
}
void SplashScreen::touchMove(const boo::STouchCoord& coord, uintptr_t tid)
{
if (m_fileBrowser.m_view)
m_fileBrowser.m_view->touchMove(coord, tid);
}
void SplashScreen::charKeyDown(unsigned long charCode, boo::EModifierKey mods, bool isRepeat)
{
skipBuildInAnimation();
}
void SplashScreen::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub) void SplashScreen::resized(const boo::SWindowRect& root, const boo::SWindowRect& sub)
{ {
ModalWindow::resized(root, sub); ModalWindow::resized(root, sub);

6
Editor/SplashScreen/SplashScreen.hpp
View File

@ -77,6 +77,12 @@ public:
void mouseMove(const boo::SWindowCoord&); void mouseMove(const boo::SWindowCoord&);
void mouseEnter(const boo::SWindowCoord&); void mouseEnter(const boo::SWindowCoord&);
void mouseLeave(const boo::SWindowCoord&); void mouseLeave(const boo::SWindowCoord&);
void scroll(const boo::SWindowCoord&, const boo::SScrollDelta&);
void touchDown(const boo::STouchCoord&, uintptr_t);
void touchUp(const boo::STouchCoord&, uintptr_t);
void touchMove(const boo::STouchCoord&, uintptr_t);
void charKeyDown(unsigned long, boo::EModifierKey, bool);
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub); void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
void draw(boo::IGraphicsCommandQueue* gfxQ); void draw(boo::IGraphicsCommandQueue* gfxQ);
}; };

2
hecl

@ -1 +1 @@
Subproject commit 1d1b3919edc049993f0bc24b819beebd4a9ae0e1 Subproject commit f723ead1c7ef79881a242934fcd8369ce7e11b48

2
libSpecter

@ -1 +1 @@
Subproject commit 71ee610afd74425cf4838f16a07c67a9f5795a2c Subproject commit 4c3688cc70a7338b75eed33ef12b4cdd91306c0d