test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-05 21:58:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix layout include from merge

Browse Source
This commit is contained in:
houzh 2023-07-26 18:51:46 +08:00
parent 9414f26bf0
commit 2556b1a965
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/view/layoutinflater.cc
View File

@ -113,14 +113,16 @@ static void startElement(void *userData, const XML_Char *name, const XML_Char **
pd->views.push_back(parent); pd->views.push_back(parent);
pd->flags.push_back(1); pd->flags.push_back(1);
if(pd->root == nullptr|| !pd->attachToRoot) if(pd->root == nullptr|| !pd->attachToRoot)
throw "<merge/> can be used only with a valid ViewGroup root and attachToRoot=true"; FATAL("<merge /> can be used only with a valid ViewGroup root(%p) and attachToRoot=true",pd->root);
return ; return ;
} }
if(strcmp(name,"include")==0){ if(strcmp(name,"include")==0){
/**the included layout's root node maybe merge,so we must use attachToRoot =true*/
const std::string layout = atts.getString("layout"); const std::string layout = atts.getString("layout");
View* includedView = LayoutInflater::from(pd->ctx)->inflate(layout,parent,false,&atts); View* includedView = LayoutInflater::from(pd->ctx)->inflate(layout,parent,true,&atts);
parent->addView(includedView,parent->generateLayoutParams(atts)); LayoutParams*lp = parent->generateLayoutParams(atts);
includedView->setLayoutParams(lp);
return; return;
} }