modify readme.md

This commit is contained in:
houzh 2023-03-07 07:52:57 +00:00
parent ca762acde6
commit 42329d818c
4 changed files with 17 additions and 15 deletions

View File

@ -83,7 +83,7 @@
# **Building CDROID:**
* 1.install dependencs: sudo apt install build-essential cmake gdb pkg-config zip gettext libx11-dev
* 2.install vcpkg
* 3.install cdroid deplibs: vcpkg install libzip cairo
* 3.install cdroid deplibs: vcpkg install gtest jsoncpp libunibreak libjpeg-turbo[jpeg8] libzip cairo
* 4.create buildings:./build.sh --port=x64
* 5.enter buildout directory and make the cdroid project

View File

@ -1,6 +1,6 @@
#pragma once
/*Generated by machine ,Do not edit!!!*/
/*Generated by machine ,Do not edit !!!*/
namespace w9{

View File

@ -2264,31 +2264,33 @@ void View::onDrawScrollBars(Canvas& canvas){
#endif
// Do not draw horizontal scroll bars for round wearable devices.
} else if ( drawVerticalScrollBar || drawHorizontalScrollBar) {
Rect& bounds = mScrollCache->mScrollBarBounds;
ScrollBarDrawable* scrollBar = mScrollCache->scrollBar;
if (drawHorizontalScrollBar) {
scrollBar->setParameters(computeHorizontalScrollRange(),
computeHorizontalScrollOffset(),computeHorizontalScrollExtent(), false);
Rect& bounds = mScrollCache->mScrollBarBounds;
getHorizontalScrollBarBounds(&bounds, nullptr);
onDrawHorizontalScrollBar(canvas,scrollBar, bounds.left, bounds.top,bounds.width, bounds.height);
onDrawHorizontalScrollBar(canvas,scrollBar, bounds);
if (bInvalidate) invalidate(bounds);
}
if (drawVerticalScrollBar) {
scrollBar->setParameters(computeVerticalScrollRange(),
computeVerticalScrollOffset(),computeVerticalScrollExtent(), true);
Rect& bounds = mScrollCache->mScrollBarBounds;
getVerticalScrollBarBounds(&bounds, nullptr);
onDrawVerticalScrollBar(canvas, scrollBar, bounds.left, bounds.top,bounds.width, bounds.height);
onDrawVerticalScrollBar(canvas, scrollBar, bounds);
if (bInvalidate) invalidate(bounds);
}
if (bInvalidate) invalidate(mScrollCache->mScrollBarBounds);
}
}
void View::onDrawHorizontalScrollBar(Canvas& canvas, Drawable* scrollBar,int l, int t, int w, int h){
scrollBar->setBounds(l, t, w, h);
scrollBar->draw(canvas);
void View::onDrawHorizontalScrollBar(Canvas& canvas, Drawable* scrollBar,const Rect&rect){
scrollBar->setBounds(rect);
scrollBar->draw(canvas);LOGD("onDrawHorizontalScrollBar(%d,%d,%d,%d)",rect.left,rect.top,rect.width,rect.height);
}
void View::onDrawVerticalScrollBar (Canvas& canvas , Drawable* scrollBar,int l, int t, int w, int h){
scrollBar->setBounds(l, t, w, h);
void View::onDrawVerticalScrollBar (Canvas& canvas , Drawable* scrollBar,const Rect&rect){
scrollBar->setBounds(rect);
scrollBar->draw(canvas);
}
@ -5879,8 +5881,8 @@ bool View::handleScrollBarDragging(MotionEvent& event) {
}
if (mScrollCache->mScrollBarDraggingState
== ScrollabilityCache::DRAGGING_HORIZONTAL_SCROLL_BAR) {
Rect bounds = mScrollCache->mScrollBarBounds;
getHorizontalScrollBarBounds(&bounds, nullptr);
Rect& bounds = mScrollCache->mScrollBarBounds;
getHorizontalScrollBarBounds(&bounds, nullptr);
int range = computeHorizontalScrollRange();
int offset = computeHorizontalScrollOffset();
int extent = computeHorizontalScrollExtent();

View File

@ -614,8 +614,8 @@ protected:
virtual void getScrollIndicatorBounds(Rect&);
virtual void onDrawScrollIndicators(Canvas& canvas);
virtual void onDrawScrollBars(Canvas& canvas);
void onDrawHorizontalScrollBar(Canvas& canvas, Drawable* scrollBar,int l, int t, int w, int h);
void onDrawVerticalScrollBar (Canvas& canvas , Drawable* scrollBar,int l, int t, int w, int h);
void onDrawHorizontalScrollBar(Canvas& canvas, Drawable* scrollBar,const Rect&);
void onDrawVerticalScrollBar (Canvas& canvas , Drawable* scrollBar,const Rect&);
void ensureTransformationInfo();
public: