fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning up paths a bit. Need to de-globalize.

Browse Source
This commit is contained in:
Ben Vanik
2015-07-06 23:03:24 -07:00
parent 8c0614b202
commit 95e2ea11eb
4 changed files with 81 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/ui/elemental_control.h
View File

@@ -29,10 +29,13 @@ class ElementalControl : public PlatformControl {
el::graphics::Renderer* renderer() const { return renderer_.get(); }
el::Element* root_element() const { return root_element_.get(); }
bool LoadLanguage(std::string filename);
bool LoadSkin(std::string filename);
protected:
using super = PlatformControl;
bool InitializeElemental(el::graphics::Renderer* renderer);
bool InitializeElemental(Loop* loop, el::graphics::Renderer* renderer);
virtual std::unique_ptr<el::graphics::Renderer> CreateRenderer() = 0;
bool Create() override;
@@ -56,6 +59,7 @@ class ElementalControl : public PlatformControl {
void OnMouseUp(MouseEvent& e) override;
void OnMouseWheel(MouseEvent& e) override;
Loop* loop_ = nullptr;
std::unique_ptr<el::graphics::Renderer> renderer_;
std::unique_ptr<el::Element> root_element_;