mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

improve place.modify

Browse Source 
it is allowed to modify a field with a new div-text which contains an existing
name in the field being modified
This commit is contained in:
Jinhao 2019-03-31 12:44:22 +08:00
parent bd01cb447e
commit 5803395b7e
1 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/gui/place.cpp
View File

@ -1,7 +1,7 @@
/* /*
* An Implementation of Place for Layout * An Implementation of Place for Layout
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -630,7 +630,8 @@ namespace nana
void collocate(); void collocate();
static division * search_div_name(division* start, const std::string&) noexcept; static division * search_div_name(division* start, const std::string&) noexcept;
std::unique_ptr<division> scan_div(place_parts::tokenizer&);
std::unique_ptr<division> scan_div(place_parts::tokenizer&, const std::string& ignore_duplicate = {});
void check_unique(const division*) const; void check_unique(const division*) const;
//connect the field/dock with div object //connect the field/dock with div object
@ -2706,7 +2707,8 @@ namespace nana
throw std::invalid_argument("nana.place: the type of the " + std::string{pos_strs[pos]} +"th parameter for collapse should be integer."); throw std::invalid_argument("nana.place: the type of the " + std::string{pos_strs[pos]} +"th parameter for collapse should be integer.");
} }
auto place::implement::scan_div(place_parts::tokenizer& tknizer) -> std::unique_ptr<division> //ignore_duplicate A field is allowed to have same name if its has an ancestor which name is same with ignore_duplicate.
auto place::implement::scan_div(place_parts::tokenizer& tknizer, const std::string& ignore_duplicate) -> std::unique_ptr<division>
{ {
using token = place_parts::tokenizer::token ; using token = place_parts::tokenizer::token ;
@ -2757,7 +2759,7 @@ namespace nana
break; break;
case token::div_start: case token::div_start:
{ {
auto div = scan_div(tknizer); auto div = scan_div(tknizer, ignore_duplicate);
if (!children.empty()) if (!children.empty())
children.back()->div_next = div.get(); children.back()->div_next = div.get();
@ -2897,8 +2899,31 @@ namespace nana
attached_field = i->second; attached_field = i->second;
//the field is attached to a division, it means there is another division with same name. //the field is attached to a division, it means there is another division with same name.
if (attached_field->attached) if (attached_field->attached)
{
//The fields are allowed to have a same name. E.g.
//place.div("A <B><C>");
//place.modify("A", "<B>"); Here the same name B must be allowed, otherwise it throws runtime error.
bool allow_same_name = false;
if (!ignore_duplicate.empty())
{
auto f = attached_field->attached->div_owner;
while (f)
{
if (f->name == ignore_duplicate)
{
allow_same_name = true;
break;
}
f = f->div_owner;
}
}
if (!allow_same_name)
throw std::runtime_error("place, the name '" + name + "' is redefined."); throw std::runtime_error("place, the name '" + name + "' is redefined.");
} }
}
token unmatch = token::width; token unmatch = token::width;
switch (div_type) switch (div_type)
@ -2977,7 +3002,16 @@ namespace nana
//attach the field to the division //attach the field to the division
div->field = attached_field; div->field = attached_field;
if (attached_field) if (attached_field)
{
//Replaces the previous div with the new div which is allowed to have a same name.
//Detaches the field from the previous div.
if (attached_field->attached)
attached_field->attached->field = nullptr;
//Attaches new div
attached_field->attached = div.get(); attached_field->attached = div.get();
}
if (children.size()) if (children.size())
{ {
@ -3263,7 +3297,7 @@ namespace nana
try try
{ {
place_parts::tokenizer tknizer(div_text); place_parts::tokenizer tknizer(div_text);
auto modified = impl_->scan_div(tknizer); auto modified = impl_->scan_div(tknizer, name);
auto modified_ptr = modified.get(); auto modified_ptr = modified.get();
modified_ptr->name = name; modified_ptr->name = name;