test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-11 04:15:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix layout break strategy

Browse Source
This commit is contained in:
侯歌 2024-05-17 09:49:07 +08:00
parent d016a4df4e
commit 21746a11d7
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/core/layout.cc
View File

@ -520,12 +520,13 @@ void Layout::relayout(bool force){
case WORDBREAK_NOBREAK:
word.append(1,mText[i]);
measureSize(wch,extents);
if( (mBreakStrategy==0) && (total_width + extents.x_advance > mWidth)){
if(total_width + extents.x_advance > mWidth){
pushLineData(start,ytop,fontextents.descent,ceil(total_width));
ytop += mLineHeight;
mLineCount++;
total_width = 0 ;
start = mBreakStrategy?(i - word.length()):i;
word.erase();
total_width=0 ; start=i;
}
total_width += extents.x_advance;
//if(mBreakStrategy==0)word.erase();
@ -535,7 +536,7 @@ void Layout::relayout(bool force){
measureSize(wch,extents);
if(mText[i]==10)extents.x_advance=0;
const int outofwidth = (total_width + extents.x_advance >mWidth);
if( (( (breaks[0]==WORDBREAK_BREAK) && ( outofwidth && mBreakStrategy ))||(linebreak==LINEBREAK_MUSTBREAK))){
if( (outofwidth && mBreakStrategy) || (linebreak==LINEBREAK_MUSTBREAK) ){
pushLineData(start,ytop,fontextents.descent,ceil(total_width));
ytop += mLineHeight;
mLineCount ++;
@ -590,6 +591,7 @@ static const std::string processBidi(const std::wstring&logstr){
void Layout::drawText(Canvas&canvas,int firstLine,int lastLine){
mCaretRect.setEmpty();
LOGD("%playoutWidth=%d fontSize=%.f alignment=%x breakStrategy=%d",this,mWidth,mFontSize,mAlignment,mBreakStrategy);
for (int lineNum = firstLine; lineNum < lastLine; lineNum++) {
int x = 0,lw = getLineWidth(lineNum,true);
TextExtents te;
@ -609,8 +611,8 @@ void Layout::drawText(Canvas&canvas,int firstLine,int lastLine){
case ALIGN_OPPOSITE:
case ALIGN_RIGHT : x = mWidth - lw ; break;
}
LOGV("line[%d/%d](%d,%d) layoutWidth=%d [%s](%d).width=%d fontsize=%.f alignment=%x abearing=%f",
lineNum,mLineCount,x,y,mWidth,TextUtils::unicode2utf8(line).c_str(),line.size(),lw,mFontSize,mAlignment,te.x_bearing);
LOGV("line[%d/%d](%d,%d) [%s](%d).width=%d abearing=%f",
lineNum,mLineCount,x,y,TextUtils::unicode2utf8(line).c_str(),line.size(),lw,te.x_bearing);
canvas.move_to(x - te.x_bearing,y);
canvas.show_text(processBidi(line));
if(mCaretPos>=lineStart&&mCaretPos<lineEnd){

2
src/gui/drawables/bitmapdrawable.cc
View File

@ -396,7 +396,7 @@ void BitmapDrawable::draw(Canvas&canvas){
dw /= fx; dh /= fy;
#if defined(__x86_64__)||defined(__amd64__)||defined(__i386__)
LOGD_IF((mBitmapWidth*mBitmapHeight>=512*512)||(std::min(fx,fy)<0.1f)||(std::max(fx,fy)>10.f),
"bitmap %s scaled %dx%d->%d,%d",mBitmapState->mResource.c_str() ,mBitmapWidth,mBitmapHeight,mBounds.width,mBounds.height);
"%p bitmap %s scaled %dx%d->%d,%d",this,mBitmapState->mResource.c_str() ,mBitmapWidth,mBitmapHeight,mBounds.width,mBounds.height);
#endif
}