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

modify View::layout

Browse Source
This commit is contained in:
houzh 2023-11-29 16:25:37 +08:00
parent 33bc78d67b
commit 8531406741
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/view/view.cc
View File

@ -1075,14 +1075,14 @@ void View::clearAnimation() {
if (mCurrentAnimation ) {
mCurrentAnimation->detach();
}
//delete mCurrentAnimation;
delete mCurrentAnimation;
mCurrentAnimation = nullptr;
invalidateParentIfNeeded();
invalidate();
}
void View::setAnimation(Animation* animation) {
//delete mCurrentAnimation;
delete mCurrentAnimation;
mCurrentAnimation = animation;
if (animation) {
// If the screen is off assume the animation start time is now instead of
@ -1536,8 +1536,7 @@ void View::onDetachedFromWindowInternal() {
destroyDrawingCache();
cleanupDraw();
if(mCurrentAnimation)mCurrentAnimation->detach();
//delete mCurrentAnimation;
delete mCurrentAnimation;
mCurrentAnimation = nullptr;
if ((mViewFlags & TOOLTIP) == TOOLTIP) {
@ -5638,7 +5637,7 @@ void View::layout(int l, int t, int w, int h){
int oldH = mBottom-mTop;
mPrivateFlags &= ~PFLAG_FORCE_LAYOUT;
mPrivateFlags3 |= PFLAG3_IS_LAID_OUT;
bool changed=setFrame(l,t,w,h);
bool changed = setFrame(l,t,w,h);
if(changed|| ((mPrivateFlags & PFLAG_LAYOUT_REQUIRED) == PFLAG_LAYOUT_REQUIRED)){
onLayout(changed, l, t, w, h);
if (shouldDrawRoundScrollbar()) {
@ -5652,6 +5651,7 @@ void View::layout(int l, int t, int w, int h){
ls(*this,l, t, w, h,oldL,oldT,oldW,oldH);
}
}
mPrivateFlags &= (~PFLAG_LAYOUT_REQUIRED);
}
const bool wasLayoutValid = isLayoutValid();