Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

More padding fixes

Browse Source
This commit is contained in:
Henrik Rydgård committed 2025-11-09 22:33:03 +01:00
1 parent fd6dbd3813
commit 9e480565bb
1 file changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files
Common/UI/View.cpp
+8 -8
View File
@@ -468,14 +468,15 @@ void Choice::ClickInternal() {
void Choice::GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert, float &w, float &h) const {
float totalW = 0.0f;
float totalH = 0.0f;
int paddingLeft = 12;
int paddingRight = 12;
if (!text_.empty() && !hideTitle_) {
int paddingLeft = 12;
int paddingRight = 12;
if (rightIconImage_.isValid()) {
paddingRight = ITEM_HEIGHT;
}
float availWidth = horiz.size - paddingLeft - paddingRight - textPadding_.horiz() - totalW;
float availWidth = horiz.size - paddingLeft - paddingRight - textPadding_.horiz();
if (availWidth < 0.0f) {
// Let it have as much space as it needs.
availWidth = MAX_ITEM_SIZE;
@@ -487,20 +488,19 @@ void Choice::GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec horiz,
float textW = 0.0f, textH = 0.0f;
dc.MeasureTextRect(dc.GetTheme().uiFont, scale, scale, text_, availBounds, &textW, &textH, FLAG_WRAP_TEXT);
totalH = std::max(totalH, textH);
totalW += textW;
if (image_.isValid()) {
totalW += 12;
totalW += totalH;
paddingLeft = ITEM_HEIGHT;
}
totalW = paddingLeft + textW + paddingRight + textPadding_.horiz();
} else {
if (image_.isValid()) {
dc.Draw()->GetAtlas()->measureImage(image_, &w, &h);
totalW = w * imgScale_ + 6;
totalW = w * imgScale_ + paddingLeft + paddingRight;
totalH = h * imgScale_;
}
}
w = totalW + (text_.empty() ? 16 : 24);
w = totalW;
h = totalH + 16;
h = std::max(h, ITEM_HEIGHT);
}