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

fix ImageView's crrash

Browse Source
This commit is contained in:
houzh 2023-11-12 21:56:10 +08:00
parent c023361b1f
commit ab3c8aa067
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gui/widget/imageview.cc
View File

@ -81,19 +81,18 @@ void ImageView::resolveUri(){
if (mDrawable != nullptr) {
return;
}
Drawable* d = nullptr;
if (!mResource.empty()) {
d = getContext()->getDrawable(mResource);
int loaded = d!=nullptr;
const int bNotNull = mResource.compare("@null");
if((d==nullptr)&&bNotNull){
if(strpbrk(mResource.c_str(),"@:")==nullptr){
RefPtr<Cairo::ImageSurface>bitmap = getContext()->getImage(mResource);
if(bitmap){
setImageBitmap(bitmap);
loaded ++;
}
}else updateDrawable(d);
LOGW_IF((loaded==0)&&bNotNull,"Unable to find resource: %s",mResource.c_str());
setImageBitmap(bitmap);
LOGW_IF(bitmap==nullptr,"Unable to find resource: %s",mResource.c_str());
}else if(mResource.compare("@null")){
Drawable* d = getContext()->getDrawable(mResource);
LOGW_IF(d==nullptr,"Unable to find resource: %s",mResource.c_str());
updateDrawable(d);
}else{
updateDrawable(nullptr);
}
}
//updateDrawable(d);
}
@ -625,8 +624,6 @@ void ImageView::updateDrawable(Drawable*d){
if ( !sameDrawable && isAttachedToWindow()) {
mDrawable->setVisible(false, false);
}
if(!sameDrawable)
delete mDrawable;
}
mDrawable = d;