diff --git a/apps/uidemo/multimedia.cc b/apps/uidemo/multimedia.cc index 05014f36..913a69db 100755 --- a/apps/uidemo/multimedia.cc +++ b/apps/uidemo/multimedia.cc @@ -24,11 +24,6 @@ public: {View*v=LayoutInflater::from(container->getContext())->inflate(res[position-2],nullptr,false); container->addView(v); v->requestLayout(); - View*btn=v->findViewById(uidemo::R::id::button1); - if(btn)btn->setOnClickListener([](View&v){ - Window*w=new Window(0,0,400,400); - w->setBackgroundColor(0xFF123456); - }); return v; }break; case 0: @@ -71,7 +66,7 @@ public: } }); gv->setVerticalScrollBarEnabled(true); - gv->setNumColumns(2); + gv->setNumColumns(3); gv->setAdapter(adapter); gv->setHorizontalSpacing(2); gv->setVerticalSpacing(2); diff --git a/src/gui/widget/abslistview.cc b/src/gui/widget/abslistview.cc index 4603d42d..286d2247 100755 --- a/src/gui/widget/abslistview.cc +++ b/src/gui/widget/abslistview.cc @@ -2851,7 +2851,7 @@ void AbsListView::onTouchUp(MotionEvent&ev) { // Since we can potentially overfling more than we can overscroll, don't // allow the weird behavior where you can scroll to a boundary then // fling further. - LOGV("Velocity [%d]%d:(%d,%d)",mActivePointerId,initialVelocity,mMinimumVelocity,mMaximumVelocity); + LOGD("Velocity [%d]%d:(%d,%d)",mActivePointerId,initialVelocity,mMinimumVelocity,mMaximumVelocity); bool flingVelocity = std::abs(initialVelocity) > mMinimumVelocity; if (flingVelocity && !((mFirstPosition == 0 && firstChildTop == contentTop - mOverscrollDistance) || diff --git a/src/gui/widget/analogclock.cc b/src/gui/widget/analogclock.cc index 2ce38527..203d740c 100755 --- a/src/gui/widget/analogclock.cc +++ b/src/gui/widget/analogclock.cc @@ -100,7 +100,7 @@ void AnalogClock::onAttachedToWindow(){ mSeconds=when.tm_sec; mChanged = true; invalidate(true); - postDelayed(mTick,500); + postDelayed(mTick,800); }; postDelayed(mTick,800); } diff --git a/src/gui/widget/viewgroup.cc b/src/gui/widget/viewgroup.cc index dfadf19a..00994432 100755 --- a/src/gui/widget/viewgroup.cc +++ b/src/gui/widget/viewgroup.cc @@ -2084,10 +2084,10 @@ void ViewGroup::addFocusables(std::vector& views, int direction, int focu } std::vector children; - for(auto c:mChildren){ + for_each(mChildren.begin(),mChildren.end(),[&children](View*c){ if(c->getVisibility()==View::VISIBLE) children.push_back(c); - }; + }); FocusFinder::sort(children, 0, children.size(), this, isLayoutRtl()); for (int i = 0; i < children.size(); ++i) { children[i]->addFocusables(views, direction, focusableMode); diff --git a/src/porting/x86/graph_xlib.c b/src/porting/x86/graph_xlib.c index 632c456c..96f4569a 100755 --- a/src/porting/x86/graph_xlib.c +++ b/src/porting/x86/graph_xlib.c @@ -173,9 +173,9 @@ DWORD GFXFlip(HANDLE surface){ XImage *img=(XImage*)surface; if(mainSurface==surface){ GFXRect rect={0,0,img->width,img->height}; - //X11Expose(0,0,img->width,img->height); + X11Expose(0,0,img->width,img->height); #if ENABLE_RFB - //rfbMarkRectAsModified(rfbScreen,rect.x,rect.y,rect.w,rect.h); + rfbMarkRectAsModified(rfbScreen,rect.x,rect.y,rect.w,rect.h); #endif }