diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/cru/ui/controls/flex_layout.hpp | 15 | ||||
| -rw-r--r-- | include/cru/win/native/platform_id.hpp | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/include/cru/ui/controls/flex_layout.hpp b/include/cru/ui/controls/flex_layout.hpp index 46c4ea55..128a79b0 100644 --- a/include/cru/ui/controls/flex_layout.hpp +++ b/include/cru/ui/controls/flex_layout.hpp @@ -42,9 +42,22 @@ class FlexLayout : public LayoutControl { void SetContentMainAlign(FlexMainAlignment value) { if (value == GetContentMainAlign()) return; render_object_->SetContentMainAlign(value); - GetWindow()->InvalidateLayout(); + if (const auto window = GetWindow()) window->InvalidateLayout(); } + FlexDirection GetFlexDirection() const { + return render_object_->GetFlexDirection(); + } + + void SetFlexDirection(FlexDirection direction) { + if (direction == GetFlexDirection()) return; + render_object_->SetFlexDirection(direction); + if (const auto window = GetWindow()) window->InvalidateLayout(); + } + + FlexChildLayoutData GetChildLayoutData(Control* control); + void SetChildLayoutData(Control* control, const FlexChildLayoutData& data); + protected: void OnAddChild(Control* child, int position) override; void OnRemoveChild(Control* child, int position) override; diff --git a/include/cru/win/native/platform_id.hpp b/include/cru/win/native/platform_id.hpp index 4b018d51..e1899ad4 100644 --- a/include/cru/win/native/platform_id.hpp +++ b/include/cru/win/native/platform_id.hpp @@ -13,7 +13,7 @@ inline bool IsWindowsResource(NativeResource* resource) { } // namespace cru::platform::native::win -#define CRU_PLATFORMID_IMPLEMENT_WIN \ - std::wstring_view GetPlatformId() const override { \ +#define CRU_PLATFORMID_IMPLEMENT_WIN \ + std::wstring_view GetPlatformId() const override { \ return ::cru::platform::native::win::win_platform_id; \ } |