diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2023-01-07 20:37:21 +0100 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2023-01-08 18:47:48 +0100 |
| commit | 47592927b31b7655b55383d72665c94176008477 (patch) | |
| tree | 2e43064219ca64a24ad6ef3e45a599c9ca48c378 /scene/gui/control.h | |
| parent | fcba87e696d58912838d8a4a6987b10efa28e78f (diff) | |
| download | redot-engine-47592927b31b7655b55383d72665c94176008477.tar.gz | |
Use BitField<> hint for ArrayFormat
This was missing in the conversion of bitflags to BitField<>.
Diffstat (limited to 'scene/gui/control.h')
| -rw-r--r-- | scene/gui/control.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scene/gui/control.h b/scene/gui/control.h index a11f7da00f..c809856538 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -198,8 +198,8 @@ private: // Container sizing. - int h_size_flags = SIZE_FILL; - int v_size_flags = SIZE_FILL; + BitField<SizeFlags> h_size_flags = SIZE_FILL; + BitField<SizeFlags> v_size_flags = SIZE_FILL; real_t expand = 1.0; Point2 custom_minimum_size; @@ -471,10 +471,10 @@ public: // Container sizing. - void set_h_size_flags(int p_flags); - int get_h_size_flags() const; - void set_v_size_flags(int p_flags); - int get_v_size_flags() const; + void set_h_size_flags(BitField<SizeFlags> p_flags); + BitField<SizeFlags> get_h_size_flags() const; + void set_v_size_flags(BitField<SizeFlags> p_flags); + BitField<SizeFlags> get_v_size_flags() const; void set_stretch_ratio(real_t p_ratio); real_t get_stretch_ratio() const; @@ -619,7 +619,7 @@ public: }; VARIANT_ENUM_CAST(Control::FocusMode); -VARIANT_ENUM_CAST(Control::SizeFlags); +VARIANT_BITFIELD_CAST(Control::SizeFlags); VARIANT_ENUM_CAST(Control::CursorShape); VARIANT_ENUM_CAST(Control::LayoutPreset); VARIANT_ENUM_CAST(Control::LayoutPresetMode); |