RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 18:47:34 +00:00
Code Issues Activity Actions

LibGUI: Use Core::Object::set_property() to handle JSON GUI properties

Browse source 
Piggyback on the existing mechanism to set individual properties.
This doesn't cover layouts or child widgets, but the per-widget own
properties can be set this way.

Any property can now be set in JSON GUI, all you need to do is handle
it in the relevant Core::Object::set_property() override. :^)
This commit is contained in:
Andreas Kling 2020-09-14 16:01:12 +02:00
parent 89822c5ae7
commit 093de0e323
1 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

71
Libraries/LibGUI/Widget.cpp
View file

@ -811,6 +811,39 @@ bool Widget::set_property(const StringView& name, const JsonValue& value)
set_visible(value.to_bool()); set_visible(value.to_bool());
return true; return true;
} }
if (name == "horizontal_size_policy") {
auto string = value.to_string();
if (string == "Fill")
set_size_policy(Gfx::Orientation::Horizontal, SizePolicy::Fill);
else if (string == "Fixed")
set_size_policy(Gfx::Orientation::Horizontal, SizePolicy::Fixed);
else
ASSERT_NOT_REACHED();
return true;
}
if (name == "vertical_size_policy") {
auto string = value.to_string();
if (string == "Fill")
set_size_policy(Gfx::Orientation::Vertical, SizePolicy::Fill);
else if (string == "Fixed")
set_size_policy(Gfx::Orientation::Vertical, SizePolicy::Fixed);
else
ASSERT_NOT_REACHED();
return true;
}
if (name == "preferred_height") {
set_preferred_size(preferred_size().width(), value.to_i32());
return true;
}
if (name == "preferred_width") {
set_preferred_size(value.to_i32(), preferred_size().height());
return true;
}
return Core::Object::set_property(name, value); return Core::Object::set_property(name, value);
} }
@ -916,41 +949,9 @@ bool Widget::load_from_json(const StringView& json_string)
bool Widget::load_from_json(const JsonObject& json) bool Widget::load_from_json(const JsonObject& json)
{ {
auto name = json.get("name"); json.for_each_member([&](auto& key, auto& value) {
if (name.is_string()) set_property(key, value);
this->set_name(name.as_string()); });
auto horizontal_size_policy = json.get("horizontal_size_policy");
if (horizontal_size_policy.is_string()) {
if (horizontal_size_policy.as_string() == "Fill")
set_size_policy(Gfx::Orientation::Horizontal, SizePolicy::Fill);
else if (horizontal_size_policy.as_string() == "Fixed")
set_size_policy(Gfx::Orientation::Horizontal, SizePolicy::Fixed);
}
auto vertical_size_policy = json.get("vertical_size_policy");
if (vertical_size_policy.is_string()) {
if (vertical_size_policy.as_string() == "Fill")
set_size_policy(Gfx::Orientation::Vertical, SizePolicy::Fill);
else if (vertical_size_policy.as_string() == "Fixed")
set_size_policy(Gfx::Orientation::Vertical, SizePolicy::Fixed);
}
auto fill_with_background_color = json.get("fill_with_background_color");
if (fill_with_background_color.is_bool())
set_fill_with_background_color(fill_with_background_color.to_bool());
auto visible = json.get("visible");
if (visible.is_bool())
set_visible(visible.to_bool());
auto preferred_height = json.get("preferred_height");
if (preferred_height.is_number())
set_preferred_size(preferred_size().width(), preferred_height.to_i32());
auto preferred_width = json.get("preferred_width");
if (preferred_width.is_number())
set_preferred_size(preferred_width.to_i32(), preferred_size().height());
auto layout_value = json.get("layout"); auto layout_value = json.get("layout");
if (!layout_value.is_null() && !layout_value.is_object()) { if (!layout_value.is_null() && !layout_value.is_object()) {