test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-11-29 18:59:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

make all subproject compile passed

Browse Source
This commit is contained in:
houzh 2024-01-17 11:08:39 +08:00
parent e839f09a1f
commit cde7e7b0ae
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/samples/barcode.cc
View File

@ -1,6 +1,6 @@
#include <cdroid.h>
#if ENABLE_BARCODE
#include <ext_widget/barcodeview.h>
#include <widgetEx/barcodeview.h>
#endif
int main(int argc,const char*argv[]){

12
src/gui/core/rect.h
View File

@ -52,11 +52,15 @@ struct CRect{
height=h;
}
void inflate(T dx,T dy){
left-=dx;
top -=dy;
width+=(dx+dx);
height+=(dy+dy);
}
void inset(T dx,T dy){
left +=dx;
top +=dy;
width-=(dx+dx);
height-=(dy+dy);
inflate(-dx,-dy);
}
bool empty()const{

2
src/modules/CMakeLists.txt
View File

@ -1 +1 @@
add_subdirectory(wpa)
#add_subdirectory(wpa)

2
tests/gui/drawable_tests.cc
View File

@ -285,7 +285,7 @@ TEST_F(DRAWABLE,clipdrawable){
ShapeDrawable*sd=new ShapeDrawable();
Shape*sp=new RectShape();
ClipDrawable *cd2=new ClipDrawable(sd,Gravity::CENTER);
ClipDrawable *cd2=new ClipDrawable(sd,Gravity::CENTER,ClipDrawable::HORIZONTAL);
sd->setShape(sp);
cd2->setDrawable(sd);
sp->setSolidColor(0xFFFF0000);

4
tests/gui/drawablemutate_tests.cc
View File

@ -71,7 +71,7 @@ TEST_F(MUTATE,ninepatch){
TEST_F(MUTATE,clip){
ColorDrawable*c=new ColorDrawable(0xFFFF0000);
ClipDrawable*d1=new ClipDrawable(c,0);
ClipDrawable*d1=new ClipDrawable(c,0,0);
ClipDrawable*d2=(ClipDrawable*)d1->getConstantState()->newDrawable();
ASSERT_NE(d2->getDrawable(),(void*)nullptr);
ASSERT_NE(dynamic_cast<ClipDrawable*>(d2),(void*)nullptr);
@ -81,7 +81,7 @@ TEST_F(MUTATE,clip){
TEST_F(MUTATE,clipshape){
ShapeDrawable*c=new ShapeDrawable();
ClipDrawable*d1=new ClipDrawable(c,0);
ClipDrawable*d1=new ClipDrawable(c,0,0);
ClipDrawable*d2=(ClipDrawable*)d1->getConstantState()->newDrawable();
ASSERT_NE(d2->getDrawable(),(void*)nullptr);
ASSERT_NE(dynamic_cast<ShapeDrawable*>(d2->getDrawable()),(void*)nullptr);