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

Fixes for override modernization

Browse Source
This commit is contained in:
Phillip Stephens
2019-08-10 17:49:41 -07:00
parent 9d5b21fd63
commit ad5e395a51
154 changed files with 303 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Editor/Space.hpp
View File

@@ -159,7 +159,7 @@ class RootSpace : public Space {
friend class ViewManager;
std::unique_ptr<specter::RootView> m_rootView;
std::unique_ptr<Space> m_spaceTree;
struct State : Space::State{AT_DECL_DNA_YAML AT_DECL_DNAV} m_state;
struct State : Space::State{AT_DECL_DNA_YAMLV } m_state;
const Space::State& spaceState() const { return m_state; }
public:
@@ -218,8 +218,7 @@ class SplitSpace : public Space, public specter::ISplitSpaceController {
std::unique_ptr<Space> m_slots[2];
std::unique_ptr<specter::SplitView> m_splitView;
struct State : Space::State {
AT_DECL_DNA_YAML
AT_DECL_DNAV
AT_DECL_DNA_YAMLV
Value<specter::SplitView::Axis> axis = specter::SplitView::Axis::Horizontal;
Value<float> split = 0.5;
} m_state;
@@ -357,7 +356,7 @@ public:
specter::IButtonBinding* binding)
: Space(vm, Class::TestSpace, parent), m_contentStr(content), m_buttonStr(button), m_binding(binding) {}
struct State : Space::State{AT_DECL_DNA_YAML AT_DECL_DNAV} m_state;
struct State : Space::State{AT_DECL_DNA_YAMLV} m_state;
const Space::State& spaceState() const { return m_state; }
bool usesToolbar() const { return true; }