From 452bbcaa84b364cb76e99c46950ad2bedf0ca7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Thu, 24 Mar 2022 15:56:09 +0100 Subject: [PATCH] LibCore: Turn size properties from an object into a size 2 array Previously, size properties were a JSON object of the form { "width": x, "height": y }. Now they are a JSON array [x, y]. Reasons for this change: - Much more concise. - More intuitive, as existing multi-dimensional properties (like margins) already use this array format. --- Userland/Libraries/LibCore/Object.h | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Userland/Libraries/LibCore/Object.h b/Userland/Libraries/LibCore/Object.h index bad2ae50de9..9faee795fc0 100644 --- a/Userland/Libraries/LibCore/Object.h +++ b/Userland/Libraries/LibCore/Object.h @@ -318,24 +318,24 @@ T* Object::find_descendant_of_type_named(String const& name) requires IsBaseOfgetter(); \ - JsonObject size_object; \ - size_object.set("width", size.width()); \ - size_object.set("height", size.height()); \ - return size_object; \ - }, \ - [this](auto& value) { \ - if (!value.is_object()) \ - return false; \ - Gfx::IntSize size; \ - size.set_width(value.as_object().get("width").to_i32()); \ - size.set_height(value.as_object().get("height").to_i32()); \ - setter(size); \ - return true; \ +#define REGISTER_SIZE_PROPERTY(property_name, getter, setter) \ + register_property( \ + property_name, \ + [this] { \ + auto size = this->getter(); \ + JsonArray size_array; \ + size_array.append(size.width()); \ + size_array.append(size.height()); \ + return size_array; \ + }, \ + [this](auto& value) { \ + if (!value.is_array()) \ + return false; \ + Gfx::IntSize size; \ + size.set_width(value.as_array()[0].to_i32()); \ + size.set_height(value.as_array()[1].to_i32()); \ + setter(size); \ + return true; \ }); #define REGISTER_ENUM_PROPERTY(property_name, getter, setter, EnumType, ...) \