preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-15 10:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI: Apply GridLayout children's margins, drop the unused grid orientation

Browse Source 
Grid children are given LinearLayoutParams almost everywhere, so their margins are
taken from those as well as from GridLayoutParams, which gains margins.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-10-24 12:49:45 +02:00
1 parent 7ddd0ce33b
commit 8b1ffb9b39
2 files changed
+23 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Common/UI/ViewGroup.cpp
+16 -5
View File
@@ -1016,9 +1016,19 @@ void AnchorLayout::Layout() {
}
GridLayout::GridLayout(GridLayoutSettings settings, LayoutParams *layoutParams)
: ViewGroup(layoutParams), settings_(settings) {
if (settings.orientation != ORIENT_HORIZONTAL)
ERROR_LOG(Log::UI, "GridLayout: Vertical layouts not yet supported");
: ViewGroup(layoutParams), settings_(settings) {}
// Grid children are mostly given LinearLayoutParams, so take the margins from those too.
static Margins GetGridChildMargins(const View *view) {
if (const GridLayoutParams *lp = view->GetLayoutParams()->As<GridLayoutParams>()) {
return lp->margins;
}
if (const LinearLayoutParams *lp = view->GetLayoutParams()->As<LinearLayoutParams>()) {
if (lp->HasMargins()) {
return lp->margins;
}
}
return Margins(0);
}
void GridLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert) {
@@ -1027,7 +1037,8 @@ void GridLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec ver
int numItems = 0;
for (size_t i = 0; i < views_.size(); i++) {
if (views_[i]->GetVisibility() != V_GONE) {
views_[i]->Measure(dc, MeasureSpec(measureType, settings_.columnWidth), MeasureSpec(measureType, settings_.rowHeight));
const Margins margins = GetGridChildMargins(views_[i]);
views_[i]->Measure(dc, MeasureSpec(measureType, settings_.columnWidth - margins.horiz()), MeasureSpec(measureType, settings_.rowHeight - margins.vert()));
numItems++;
}
}
@@ -1063,7 +1074,7 @@ void GridLayout::Layout() {
itemBounds.w = settings_.columnWidth;
itemBounds.h = settings_.rowHeight;
ApplyGravity(itemBounds, Margins(0.0f),
ApplyGravity(itemBounds, GetGridChildMargins(views_[i]),
views_[i]->GetMeasuredWidth(), views_[i]->GetMeasuredHeight(),
grav, innerBounds);