godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use BitField<> hint for ArrayFormat

Browse Source 
This was missing in the conversion of bitflags to BitField<>.
This commit is contained in:
Juan Linietsky
2023-01-07 20:37:21 +01:00
parent fcba87e696
commit 47592927b3
29 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/gui/control.cpp
View File

@@ -1684,27 +1684,27 @@ void Control::_clear_size_warning() {
// Container sizing.
void Control::set_h_size_flags(int p_flags) {
if (data.h_size_flags == p_flags) {
void Control::set_h_size_flags(BitField<SizeFlags> p_flags) {
if ((int)data.h_size_flags == (int)p_flags) {
return;
}
data.h_size_flags = p_flags;
emit_signal(SceneStringNames::get_singleton()->size_flags_changed);
}
int Control::get_h_size_flags() const {
BitField<Control::SizeFlags> Control::get_h_size_flags() const {
return data.h_size_flags;
}
void Control::set_v_size_flags(int p_flags) {
if (data.v_size_flags == p_flags) {
void Control::set_v_size_flags(BitField<SizeFlags> p_flags) {
if ((int)data.v_size_flags == (int)p_flags) {
return;
}
data.v_size_flags = p_flags;
emit_signal(SceneStringNames::get_singleton()->size_flags_changed);
}
int Control::get_v_size_flags() const {
BitField<Control::SizeFlags> Control::get_v_size_flags() const {
return data.v_size_flags;
}
@@ -3326,12 +3326,12 @@ void Control::_bind_methods() {
BIND_ENUM_CONSTANT(PRESET_MODE_KEEP_HEIGHT);
BIND_ENUM_CONSTANT(PRESET_MODE_KEEP_SIZE);
BIND_ENUM_CONSTANT(SIZE_SHRINK_BEGIN);
BIND_ENUM_CONSTANT(SIZE_FILL);
BIND_ENUM_CONSTANT(SIZE_EXPAND);
BIND_ENUM_CONSTANT(SIZE_EXPAND_FILL);
BIND_ENUM_CONSTANT(SIZE_SHRINK_CENTER);
BIND_ENUM_CONSTANT(SIZE_SHRINK_END);
BIND_BITFIELD_FLAG(SIZE_SHRINK_BEGIN);
BIND_BITFIELD_FLAG(SIZE_FILL);
BIND_BITFIELD_FLAG(SIZE_EXPAND);
BIND_BITFIELD_FLAG(SIZE_EXPAND_FILL);
BIND_BITFIELD_FLAG(SIZE_SHRINK_CENTER);
BIND_BITFIELD_FLAG(SIZE_SHRINK_END);
BIND_ENUM_CONSTANT(MOUSE_FILTER_STOP);
BIND_ENUM_CONSTANT(MOUSE_FILTER_PASS);