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

modify ninepatch.cc,use LOG insteadof exception

Browse Source
This commit is contained in:
houzh 2023-06-12 07:50:16 +00:00
parent 45cee88695
commit c1448176b1
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/idgen.py
View File

@ -203,8 +203,9 @@ if ( __name__ == "__main__"):
fidxml = sys.argv[2]+"/values/ID.xml" fidxml = sys.argv[2]+"/values/ID.xml"
if not filecmp.cmp(ftempids,fidxml): if not filecmp.cmp(ftempids,fidxml):
#content is changed,we must copy ftempids to fidxml(sys.argv[2]+"/values/ID.xml) #content is changed,we must copy ftempids to fidxml(sys.argv[2]+"/values/ID.xml)
print(namespace+"'s IDs is changed "+ftempids)
shutil.copyfile(ftempids,fidxml) shutil.copyfile(ftempids,fidxml)
idgen.dict2RH(sys.argv[3]) idgen.dict2RH(sys.argv[3])
os.remove(ftempids) os.remove(ftempids)
else: else:
print(sys.argv[1]+"'s IDs it not changed") print(namespace+"'s IDs it not changed")

14
src/gui/drawables/ninepatch.cc
View File

@ -41,7 +41,7 @@ void NinePatch::draw(Canvas& painter, int x, int y) {
void NinePatch::setImageSize(int width, int height) { void NinePatch::setImageSize(int width, int height) {
int resizeWidth = 0; int resizeWidth = 0;
int resizeHeight = 0; int resizeHeight = 0;
char sError[256]={0}; std::ostringstream oss;
if((mWidth == width) && (mHeight==height))return; if((mWidth == width) && (mHeight==height))return;
for (int i = 0; i < mResizeDistancesX.size(); i++) { for (int i = 0; i < mResizeDistancesX.size(); i++) {
resizeWidth += mResizeDistancesX[i].second; resizeWidth += mResizeDistancesX[i].second;
@ -50,17 +50,17 @@ void NinePatch::setImageSize(int width, int height) {
resizeHeight += mResizeDistancesY[i].second; resizeHeight += mResizeDistancesY[i].second;
} }
if (width < (mImage->get_width() - 2 - resizeWidth) && height < (mImage->get_height() - 2 - resizeHeight)) { if (width < (mImage->get_width() - 2 - resizeWidth) && height < (mImage->get_height() - 2 - resizeHeight)) {
sprintf(sError,"IncorrectWidth(%d) must>=%d(image.width)-2-%d(resizeWidth) && incorrectHeight(%d)>=%d(image.height)-2-%d(resizeHeight))", oss<<"IncorrectWidth("<<width<<") must>="<<mImage->get_width()<<"(image.width)-2-"<<resizeWidth<<"(resizeWidth) && incorrectHeight("
width, mImage->get_width(),resizeWidth,height,mImage->get_height(),resizeHeight); <<height<<")>="<<mImage->get_height()<<"(image.height)-2-"<<resizeHeight<<"(resizeHeight))";
} }
if (width < (mImage->get_width() - 2 - resizeWidth)) { if (width < (mImage->get_width() - 2 - resizeWidth)) {
sprintf(sError,"IncorrectWidth(%d) must>=%d(image.width)-2-%d(resizeWidth)",width,mImage->get_width(),resizeWidth); oss<<"IncorrectWidth("<<width<<"must>="<<mImage->get_width()<<"image.width)-2-"<<resizeWidth<<"(resizeWidth)";
} }
if (height < (mImage->get_height() - 2 - resizeHeight)) { if (height < (mImage->get_height() - 2 - resizeHeight)) {
sprintf(sError,"IncorrectHeight(%d) must>=(%d(image.height)-2-%d(resizeHeight)",height,mImage->get_height(),resizeHeight); oss<<"IncorrectHeight("<<height<<"must>="<<mImage->get_height()<<"(image.height)-2-"<<resizeHeight<<"(resizeHeight)";
} }
if(sError[0]) if(oss.str().empty()==false)
throw std::invalid_argument(sError); LOG(ERROR)<<oss.str();
if (width != mWidth || height != mHeight) { if (width != mWidth || height != mHeight) {
mWidth = width; mWidth = width;
mHeight = height; mHeight = height;