From 3f8dfa346cde94badea6fbe54b23852608a6b3d5 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Thu, 18 Apr 2019 12:12:52 +0200 Subject: [PATCH] sculpt_manager: remove double name attributes The 'name' attribute was generated by both the call of 'gen_named_node' and 'Hoverable_item::gen_button_attr'. Use only the former. --- .../gems/src/app/sculpt_manager/view/hoverable_item.h | 11 +++++++++-- repos/gems/src/app/sculpt_manager/view/popup_dialog.h | 6 +++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/repos/gems/src/app/sculpt_manager/view/hoverable_item.h b/repos/gems/src/app/sculpt_manager/view/hoverable_item.h index 2e543bba8..b34c9472b 100644 --- a/repos/gems/src/app/sculpt_manager/view/hoverable_item.h +++ b/repos/gems/src/app/sculpt_manager/view/hoverable_item.h @@ -44,14 +44,21 @@ struct Sculpt::Hoverable_item */ bool hovered(Id const &id) const { return id == _hovered; } + /** + * Generate hovered attribute depending on the item state + */ + void gen_hovered_attr(Xml_generator &xml, Id const &id) const + { + if (hovered(id)) xml.attribute("hovered", "yes"); + } + /** * Generate button attributes depending on the item state */ void gen_button_attr(Xml_generator &xml, Id const &id) const { xml.attribute("name", id); - - if (hovered(id)) xml.attribute("hovered", "yes"); + gen_hovered_attr(xml, id); } }; diff --git a/repos/gems/src/app/sculpt_manager/view/popup_dialog.h b/repos/gems/src/app/sculpt_manager/view/popup_dialog.h index b02b0c621..8f3bf6200 100644 --- a/repos/gems/src/app/sculpt_manager/view/popup_dialog.h +++ b/repos/gems/src/app/sculpt_manager/view/popup_dialog.h @@ -270,7 +270,7 @@ struct Sculpt::Popup_dialog gen_named_node(xml, "button", "back", [&] () { xml.attribute("selected", "yes"); xml.attribute("style", "back"); - _item.gen_button_attr(xml, name); + _item.gen_hovered_attr(xml, name); xml.node("hbox", [&] () { }); }); gen_named_node(xml, "label", "label", [&] () { @@ -299,7 +299,7 @@ struct Sculpt::Popup_dialog xml.attribute("selected", "yes"); xml.attribute("style", style); - _item.gen_button_attr(xml, name); + _item.gen_hovered_attr(xml, name); xml.node("hbox", [&] () { }); }); gen_named_node(xml, "label", "name", [&] () { @@ -328,7 +328,7 @@ struct Sculpt::Popup_dialog xml.attribute("selected", "yes"); xml.attribute("style", style); - _route_item.gen_button_attr(xml, name); + _route_item.gen_hovered_attr(xml, name); xml.node("hbox", [&] () { }); }); gen_named_node(xml, "label", "name", [&] () {