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

fix cycle loop of RelativeLayout::DependencyGraph

Browse Source
This commit is contained in:
侯歌 2021-09-02 18:26:25 +08:00
parent 43dad2fc96
commit 83ecc2e928
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/uidemo/lyrics.cc
View File

@ -93,7 +93,7 @@ int Lyrics::loadImages(){
counter++;
RefPtr<ImageSurface>image=cdroid::Context::loadImage(stm);
images[picture_types[type[1]&0xFF]]=image;
LOGD("%s:imagesize=%dx%d",picture_types[type[1]&0xFF],image->get_width(),image->get_height());
LOGV("%s:imagesize=%dx%d",picture_types[type[1]&0xFF],image->get_width(),image->get_height());
}
}//while
ID3_free(tag);

32
apps/uidemo/multimedia.cc
View File

@ -133,26 +133,31 @@ MediaWindow::MediaWindow(int x,int y,int w,int h):Window(x,y,w,h){
filter_type=VIDEO;
sort_revert=false;
setBackgroundColor(0x000000);
RelativeLayout*layout=new RelativeLayout(w,h);//LayoutParams::MATCH_PARENT,LayoutParams::MATCH_PARENT);
RelativeLayout::LayoutParams*lp=new RelativeLayout::LayoutParams(LayoutParams::MATCH_PARENT,LayoutParams::WRAP_CONTENT);
lp->addRule(RelativeLayout::ALIGN_PARENT_BOTTOM);
mFilePath=new TextView("",600,30);
mFilePath->setSingleLine(true);
mFilePath->setEllipsize(Layout::ELLIPSIS_MIDDLE);
mFilePath->setTextSize(28);
layout->addView(mFilePath,lp).setId(100);
//mdtype=new ToolBar(1280,30);
//header=new ToolBar(1280,30);
mdlist=new ListView(600,520);
mdlist->setPos(40,130);
lp=new RelativeLayout::LayoutParams(600,LayoutParams::MATCH_PARENT);
lp->addRule(RelativeLayout::ABOVE,100);
mdlist->setSelector(new ColorDrawable(0x8000ff00));
mdlist->setOverScrollMode(View::OVER_SCROLL_ALWAYS);
mdlist->setVerticalScrollBarEnabled(true);
mdlist->setDrawSelectorOnTop(true);
mdlist->setDivider(new ColorDrawable(0x40FFFFFF));
mdlist->setDividerHeight(1);
addView(mdlist);
layout->addView(mdlist,lp).setId(1);
mFilePath=new TextView("",600,30);
mFilePath->setSingleLine(true);
mFilePath->setEllipsize(Layout::ELLIPSIS_MIDDLE);
mFilePath->setTextSize(28);
addView(mFilePath).setPos(40,660);
mAdapter=new MediaAdapter();
mAdapter->loadMedias("/");
@ -163,10 +168,15 @@ MediaWindow::MediaWindow(int x,int y,int w,int h):Window(x,y,w,h){
processMedia(mdi);
mFilePath->setText(SimplifyPath(mdi.fullpath));
});
lyrics=new LyricsView("",440,mdlist->getHeight()+30);
lyrics->setVisibility(VISIBLE);
addView(lyrics).setPos(750,130).setBackgroundColor(0x80000000);
lyrics=new LyricsView("",440,mdlist->getHeight()+30);
lp=new RelativeLayout::LayoutParams(LayoutParams::MATCH_PARENT,LayoutParams::MATCH_PARENT);
lp->addRule(RelativeLayout::RIGHT_OF,1);
lp->addRule(RelativeLayout::ABOVE,100);
lyrics->setVisibility(VISIBLE);
layout->addView(lyrics,lp).setBackgroundColor(0x80000000);
addView(layout);
requestLayout();
}
int MediaWindow::processMedia(const MediaItem mdi){

4
src/gui/widget/relativelayout.cc
View File

@ -996,9 +996,7 @@ RelativeLayout::DependencyGraph::Node::Node(View*v){
}
RelativeLayout::DependencyGraph::Node::~Node(){
for(auto d:dependents){
delete d.second;
}
}
RelativeLayout::DependencyGraph::~DependencyGraph(){