openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

dialogxml: Search for anchor widgets recursively within containers

Browse Source 
Aso throw an error if relative attribute is missing when an anchor is specified
This commit is contained in:
Celtic Minstrel
2024-08-31 00:58:16 -04:00
committed by Celtic Minstrel
parent 7e063ab1ed
commit 1db98bc7c0
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dialogxml/dialogs/dialog.cpp
View File

@@ -280,13 +280,29 @@ void cDialog::loadFromFile(const DialogDefn& file){
std::function<void(const std::string&, cControl&)> process_ctrl;
process_ctrl = [this, &all_resolved, &process_ctrl](const std::string&, cControl& ctrl) {
if(!ctrl.anchor.empty()) {
auto anchor = controls[ctrl.anchor];
cControl* anchor = findControl(ctrl.anchor);
if(anchor == nullptr) {
std::string ctrlType;
switch(ctrl.getType()) {
case CTRL_UNKNOWN: ctrlType = "???"; break;
case CTRL_BTN: ctrlType = "button"; break;
case CTRL_LED: ctrlType = "led"; break;
case CTRL_PICT: ctrlType = "pict"; break;
case CTRL_FIELD: ctrlType = "field"; break;
case CTRL_TEXT: ctrlType = "text"; break;
case CTRL_GROUP: ctrlType = "group"; break;
case CTRL_STACK: ctrlType = "stack"; break;
case CTRL_SCROLL: ctrlType = "slider"; break;
case CTRL_PANE: ctrlType = "pane"; break;
}
throw xBadVal(ctrlType, "anchor", ctrl.anchor, 0, 0, fname);
}
if(!anchor->anchor.empty()) {
// Make sure it's not a loop!
std::vector<std::string> refs{ctrl.anchor};
while(!anchor->anchor.empty()) {
refs.push_back(anchor->anchor);
anchor = controls[anchor->anchor];
anchor = findControl(anchor->anchor);
if(std::find(refs.begin(), refs.end(), anchor->anchor) != refs.end()) {
std::string ctrlType;
switch(ctrl.getType()) {
@@ -1071,19 +1087,25 @@ const cControl& cDialog::operator[](std::string id) const {
return const_cast<cDialog&>(*this).getControl(id);
}
cControl& cDialog::getControl(std::string id) {
cControl* cDialog::findControl(std::string id) {
ctrlIter iter = controls.find(id);
if(iter != controls.end()) return *(iter->second);
if(iter != controls.end()) return iter->second;
iter = controls.begin();
while(iter != controls.end()){
if(iter->second->isContainer()){
cContainer* tmp = dynamic_cast<cContainer*>(iter->second);
if(tmp->hasChild(id))
return tmp->getChild(id);
return &tmp->getChild(id);
}
iter++;
}
return nullptr;
}
cControl& cDialog::getControl(std::string id) {
if(auto ctrl = findControl(id))
return *ctrl;
throw std::invalid_argument(id + " does not exist in dialog " + fname);
}

1
src/dialogxml/dialogs/dialog.hpp
View File

@@ -66,6 +66,7 @@ class cDialog {
int winLastY=-1;
std::string currentFocus;
cDialog* parent;
cControl* findControl(std::string id);
std::string generateRandomString();
void loadFromFile(const DialogDefn& file);
void handleTab(bool reverse);

6
src/dialogxml/widgets/control.cpp
View File

@@ -564,6 +564,12 @@ void cControl::validatePostParse(ticpp::Element& elem, std::string fname, const
if((horz != POS_ABS && horz != POS_REL_NEG) || (vert != POS_ABS && vert != POS_REL_NEG))
throw xMissingAttr(elem.Value(), "anchor", elem.Row(), elem.Column(), fname);
}
if((attrs.count("anchor") || attrs.count("rel-anchor")) && horz == POS_ABS && vert == POS_ABS) {
// If an anchor is specified, "relative" must be set to something other than "abs".
if(attrs.count("relative"))
throw xBadVal(elem.Value(), "relative", "abs", elem.Row(), elem.Column(), fname);
else throw xMissingAttr(elem.Value(), "relative", elem.Row(), elem.Column(), fname);
}
if(attrs.count("anchor") && attrs.count("rel-anchor"))
throw xBadAttr(elem.Value(), "(rel-)anchor", elem.Row(), elem.Column(), fname);
}