Merge "Improve the layout-related comments." into nyc-dev
This commit is contained in:
commit
343eb722dd
1 changed files with 10 additions and 8 deletions
|
@ -105,16 +105,18 @@ int ScreenRecoveryUI::PixelsFromDp(int dp) {
|
||||||
|
|
||||||
// Here's the intended layout:
|
// Here's the intended layout:
|
||||||
|
|
||||||
// 162dp
|
// | regular large
|
||||||
// icon (200dp)
|
// ---------+--------------------
|
||||||
// 62dp
|
// | 220dp 366dp
|
||||||
// text (14sp)
|
// icon | (200dp) (200dp)
|
||||||
// 24dp
|
// | 68dp 68dp
|
||||||
// progress (2dp)
|
// text | (14sp) (14sp)
|
||||||
// 172dp
|
// | 32dp 32dp
|
||||||
|
// progress | (2dp) (2dp)
|
||||||
|
// | 194dp 340dp
|
||||||
|
|
||||||
// Note that "baseline" is actually the *top* of each icon (because that's how our drawing
|
// Note that "baseline" is actually the *top* of each icon (because that's how our drawing
|
||||||
// routines work), so that's the more useful measurement.
|
// routines work), so that's the more useful measurement for calling code.
|
||||||
|
|
||||||
int ScreenRecoveryUI::GetAnimationBaseline() {
|
int ScreenRecoveryUI::GetAnimationBaseline() {
|
||||||
return GetTextBaseline() - PixelsFromDp(68) - gr_get_height(loopFrames[0]);
|
return GetTextBaseline() - PixelsFromDp(68) - gr_get_height(loopFrames[0]);
|
||||||
|
|
Loading…
Reference in a new issue