RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:27:35 +00:00
Code Issues Activity Actions

LibGUI: Add u64 type to LibGUI::Variant

Browse source 
`uint` has also been more appropriately renamed to
u32.
This commit is contained in:
Jesse Buhagiar 2021-05-26 23:23:31 +10:00 • committed by Linus Groh
parent 9adcfd5726
commit 786275feb8
3 changed files with 63 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Userland/Libraries/LibGUI/Variant.h
View file

@ -20,7 +20,8 @@ public:
Variant(float);
Variant(i32);
Variant(i64);
Variant(unsigned);
Variant(u32);
Variant(u64);
Variant(const char*);
Variant(const StringView&);
Variant(const String&);
@ -49,7 +50,8 @@ public:
Bool,
Int32,
Int64,
UnsignedInt,
UnsignedInt32,
UnsignedInt64,
Float,
String,
Bitmap,
@ -66,7 +68,8 @@ public:
bool is_bool() const { return m_type == Type::Bool; }
bool is_i32() const { return m_type == Type::Int32; }
bool is_i64() const { return m_type == Type::Int64; }
bool is_uint() const { return m_type == Type::UnsignedInt; }
bool is_u32() const { return m_type == Type::UnsignedInt32; }
bool is_u64() const { return m_type == Type::UnsignedInt64; }
bool is_float() const { return m_type == Type::Float; }
bool is_string() const { return m_type == Type::String; }
bool is_bitmap() const { return m_type == Type::Bitmap; }
@ -95,8 +98,10 @@ public:
return m_value.as_i32 != 0;
if (type() == Type::Int64)
return m_value.as_i64 != 0;
if (type() == Type::UnsignedInt)
return m_value.as_uint != 0;
if (type() == Type::UnsignedInt32)
return m_value.as_u32 != 0;
if (type() == Type::UnsignedInt64)
return m_value.as_u64 != 0;
if (type() == Type::Rect)
return !as_rect().is_null();
if (type() == Type::Size)
@ -118,10 +123,16 @@ public:
return m_value.as_i64;
}
unsigned as_uint() const
u32 as_u32() const
{
VERIFY(type() == Type::UnsignedInt);
return m_value.as_uint;
VERIFY(type() == Type::UnsignedInt32);
return m_value.as_u32;
}
u64 as_u64() const
{
VERIFY(type() == Type::UnsignedInt64);
return m_value.as_u64;
}
template<typename T>
@ -135,9 +146,13 @@ public:
return as_bool() ? 1 : 0;
if (is_float())
return (int)as_float();
if (is_uint()) {
VERIFY(as_uint() <= INT32_MAX);
return (int)as_uint();
if (is_u32()) {
VERIFY(as_u32() <= INT32_MAX);
return static_cast<i32>(as_u32());
}
if (is_u64()) {
VERIFY(as_u64() <= INT64_MAX);
return static_cast<i64>(as_u64());
}
if (is_string())
return as_string().to_int().value_or(0);
@ -256,7 +271,8 @@ private:
bool as_bool;
i32 as_i32;
i64 as_i64;
unsigned as_uint;
u32 as_u32;
u64 as_u64;
float as_float;
Gfx::RGBA32 as_color;
Gfx::TextAlignment as_text_alignment;