diff --git a/src/gui/core/uieventsource.cc b/src/gui/core/uieventsource.cc index 636a5b00..987b0876 100755 --- a/src/gui/core/uieventsource.cc +++ b/src/gui/core/uieventsource.cc @@ -40,9 +40,6 @@ int UIEventSource::handleRunnables(){ if ( ((mFlags&1)==0) && mAttachedView && mAttachedView->isAttachedToWindow()){ if(mAttachedView->isLayoutRequested()) mLayoutRunner(); - mRunnables.remove_if([](const RUNNER&r)->bool{ - return r.removed; - }); const nsecs_t nowms = SystemClock::uptimeMillis(); //maybe user will removed runnable itself in its runnable'proc,so we use removed flag to flag it while(mRunnables.size() && ((mFlags&1)==0)){ diff --git a/src/gui/widgetEx/barcodeview.cc b/src/gui/widgetEx/barcodeview.cc index c6e006f0..f7134cd1 100644 --- a/src/gui/widgetEx/barcodeview.cc +++ b/src/gui/widgetEx/barcodeview.cc @@ -148,7 +148,6 @@ int BarcodeView::getBorderType()const{ } int BarcodeView::getSymbology()const{ - return mSymbol->symbology; } @@ -158,7 +157,7 @@ void BarcodeView::setSymbology(int code){ if(rc!=0){ mSymbology = code; mSymbol->symbology = code; - if(!mText.empty()) invalidate(); + if(!mText.empty()) requestLayout(); } } @@ -206,7 +205,7 @@ bool BarcodeView::getSHRT()const{ void BarcodeView::setZoom(float zoom){ mSymbol->scale = zoom; mZoom = zoom; - invalidate(); + requestLayout(); } float BarcodeView::getZoom()const{