test/Cdroid
1
0
Fork 0
mirror of https://gitee.com/houstudio/Cdroid.git synced 2024-12-10 23:22:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix numberpicker's drawable showing

Browse Source
This commit is contained in:
houzh 2023-09-21 17:24:14 +08:00
parent eddef5062d
commit 6f445a33c3
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/widget/numberpicker.cc
View File

@ -1306,18 +1306,22 @@ void NumberPicker::initializeSelectorWheel(){
std::vector<int>& selectorIndices = mSelectorIndices;
const float textGapCount = selectorIndices.size();
if (isHorizontalMode()) {
const int selectedWidth= (mSelectedText->getVisibility()==View::VISIBLE)?std::max(mSelectedTextSize,mSelectedText->getWidth()):mSelectedTextSize;
int selectedWidth= (mSelectedText->getVisibility()==View::VISIBLE)?std::max(mSelectedTextSize,mSelectedText->getWidth()):mSelectedTextSize;
const int totalTextSize = int ((selectorIndices.size() - 1) * mSelectedTextSize + selectedWidth);
float totalTextGapWidth = getWidth() - totalTextSize;
mSelectorTextGapWidth = (int) (totalTextGapWidth / textGapCount);
mSelectorElementSize = (int) getMaxTextSize() + mSelectorTextGapWidth;
mSelectorElementSize = std::min(getMaxTextSize() + mSelectorTextGapWidth,getWidth()/textGapCount);
if(mSelectedText->getVisibility()==View::INVISIBLE)
selectedWidth=mSelectorElementSize;
mInitialScrollOffset = (int) (mSelectedTextCenterX - mSelectorElementSize * mWheelMiddleItemIndex-(selectedWidth-mSelectorElementSize)/2);
} else {
const int selectedHeight= (mSelectedText->getVisibility()==View::VISIBLE)?std::max(mSelectedTextSize,mSelectedText->getHeight()):mSelectedTextSize;
int selectedHeight= (mSelectedText->getVisibility()==View::VISIBLE)?std::max(mSelectedTextSize,mSelectedText->getHeight()):mSelectedTextSize;
const int totalTextSize = int ((selectorIndices.size() - 1) * mSelectedTextSize + selectedHeight);
float totalTextGapHeight= getHeight() - totalTextSize;
mSelectorTextGapHeight = (int) (totalTextGapHeight / textGapCount);
mSelectorElementSize = (int) getMaxTextSize() + mSelectorTextGapHeight;
mSelectorElementSize = std::min(getMaxTextSize() + mSelectorTextGapHeight,getHeight()/textGapCount);
if(mSelectedText->getVisibility()==View::INVISIBLE)
selectedHeight=mSelectorElementSize;
mInitialScrollOffset = (int) (mSelectedTextCenterY - mSelectorElementSize * mWheelMiddleItemIndex-(selectedHeight-mSelectorElementSize)/2);
}
LOGV("mInitialScrollOffset=%d %d/%d textsize=%d,%d",mInitialScrollOffset,mSelectorElementSize,mSelectedText->getHeight(),mSelectedTextSize,mTextSize);