ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-20 17:11:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sculpt: refresh popup when toggling launchers

Browse Source 
Update the popup view whenever a runtime-state change is detected.
Otherwise the toggling of an item in the options tab is not always
reflected at the dialog. Observed when running Sculpt on Linux.
This commit is contained in:
Norman Feske 2025-04-14 16:59:22 +02:00
parent a51ea642f1
commit 238b7935b2
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
repos/gems/src/app/sculpt_manager/main.cc
View File

@ -911,6 +911,8 @@ struct Sculpt::Main : Input_event_handler,
{
_diag_dialog.refresh();
_graph_view.refresh();
if (_popup.state == Popup::VISIBLE)
_popup_dialog.refresh();
if (_system_visible)
_system_dialog.refresh();
@ -2356,12 +2358,13 @@ void Sculpt::Main::_handle_update_state(Xml_node const &update_state)
void Sculpt::Main::_handle_runtime_state(Xml_node const &state)
{
_runtime_state.update_from_state_report(state);
bool reconfigure_runtime = false;
bool regenerate_dialog = false;
bool refresh_storage = false;
if (_runtime_state.update_from_state_report(state).progress)
regenerate_dialog = true;
/* check for completed storage operations */
_storage._storage_devices.for_each([&] (Storage_device &device) {
@ -2558,10 +2561,8 @@ void Sculpt::Main::_handle_runtime_state(Xml_node const &state)
if (refresh_storage)
_handle_storage_devices();
if (regenerate_dialog) {
if (regenerate_dialog)
_generate_dialog();
_graph_view.refresh();
}
if (reconfigure_runtime)
generate_runtime_config();

28
repos/gems/src/app/sculpt_manager/model/runtime_state.h
View File

@ -49,6 +49,17 @@ class Sculpt::Runtime_state : public Runtime_info
unsigned long avail_caps;
Version version;
bool operator != (Info const &other) const
{
return selected != other.selected
|| tcb_updated != other.tcb_updated
|| assigned_ram != other.assigned_ram
|| avail_ram != other.avail_ram
|| assigned_caps != other.assigned_caps
|| avail_caps != other.avail_caps
|| version.value != other.version.value;
}
};
private:
@ -84,8 +95,9 @@ class Sculpt::Runtime_state : public Runtime_info
return node.has_type("child");
}
void update_from_xml(Xml_node const &node)
Progress update_from_xml(Xml_node const &node)
{
Info const orig_info = info;
node.with_optional_sub_node("ram", [&] (Xml_node const &ram) {
info.assigned_ram = max(ram.attribute_value("assigned", Number_of_bytes()),
ram.attribute_value("quota", Number_of_bytes()));
@ -99,6 +111,8 @@ class Sculpt::Runtime_state : public Runtime_info
});
info.version.value = node.attribute_value("version", 0U);
return { info != orig_info };
}
};
@ -226,22 +240,28 @@ class Sculpt::Runtime_state : public Runtime_info
~Runtime_state() { reset_abandoned_and_launched_children(); }
void update_from_state_report(Xml_node const &state)
Progress update_from_state_report(Xml_node const &state)
{
Progress result { };
_children.update_from_xml(state,
/* create */
[&] (Xml_node const &node) -> Child & {
result.progress = true;
return *new (_alloc)
Child(node.attribute_value("name", Start_name())); },
/* destroy */
[&] (Child &child) { destroy(_alloc, &child); },
[&] (Child &child) {
result.progress = true;
destroy(_alloc, &child); },
/* update */
[&] (Child &child, Xml_node const &node) {
child.update_from_xml(node); }
if (child.update_from_xml(node).progress)
result.progress = true; }
);
return result;
}
/**