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

fix textview's layout issues in height measures

Browse Source
This commit is contained in:
houzh 2023-12-01 19:23:16 +08:00
parent 41dd98e959
commit a37477cf16
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/widget/textview.cc
View File

@ -1077,13 +1077,12 @@ void TextView::onMeasure(int widthMeasureSpec, int heightMeasureSpec){
//mLayout->setWidth(width- getCompoundPaddingLeft() - getCompoundPaddingRight());
} else {
int txtWidth,txtHeight;
mLayout->setWidth(INT_MAX);//mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight());
mLayout->setWidth(widthSize/*mRight - mLeft*/ - getCompoundPaddingLeft() - getCompoundPaddingRight());
mLayout->relayout();
mHintLayout->relayout();
txtWidth = desired(mLayout);
txtWidth = mLayout->getMaxLineWidth();//desired(mLayout);
txtHeight= mLayout->getHeight();
LOGV("%p:%d Measuredsize=%dx%d fontsize=%d",this,mID,txtWidth,txtHeight,getFontSize());
width = txtWidth+getPaddingLeft()+getPaddingRight();;
width = txtWidth+getPaddingLeft() + getPaddingRight();
Drawables* dr = mDrawables;
if (dr != nullptr) {
width = std::max(width, dr->mDrawableWidthTop);
@ -1112,7 +1111,7 @@ void TextView::onMeasure(int widthMeasureSpec, int heightMeasureSpec){
int hintWant = want;
int hintWidth = (mHintLayout == nullptr) ? hintWant : mHintLayout->getMaxLineWidth();
mLayout->setWidth(width);
mLayout->setWidth(want);
if (heightMode == MeasureSpec::EXACTLY) {
// Parent has told us how big to be. So be it.
height = heightSize;