Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI: Fix clipping with margins.

Browse source 
Affected text views, like "No screenshot." in save states.
This commit is contained in:
Unknown W. Brackets 2016-01-23 11:45:55 -08:00
parent 21a15e4728
commit 8d41664bb1
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/native/ui/view.cpp
View file

@ -658,9 +658,8 @@ void TextView::Draw(UIContext &dc) {
clip = false; clip = false;
} }
if (clip) { if (clip) {
Bounds clipRect = bounds_.Expand(10); // TODO: Remove this hackery
dc.Flush(); dc.Flush();
dc.PushScissor(clipRect); dc.PushScissor(bounds_);
} }
// In case it's been made focusable. // In case it's been made focusable.
if (HasFocus()) { if (HasFocus()) {

4
ext/native/ui/viewgroup.cpp
View file

@ -35,8 +35,8 @@ bool IsDragCaptured(int id) {
} }
void ApplyGravity(const Bounds outer, const Margins &margins, float w, float h, int gravity, Bounds &inner) { void ApplyGravity(const Bounds outer, const Margins &margins, float w, float h, int gravity, Bounds &inner) {
inner.w = w - (margins.left + margins.right); inner.w = w;
inner.h = h - (margins.top + margins.bottom); inner.h = h;
switch (gravity & G_HORIZMASK) { switch (gravity & G_HORIZMASK) {
case G_LEFT: inner.x = outer.x + margins.left; break; case G_LEFT: inner.x = outer.x + margins.left; break;