From 1c795ccccd7c607e9bd018ff2564aab63e06dfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Tue, 3 Jan 2017 20:54:00 +0000 Subject: [PATCH] =?UTF-8?q?On=20Lines=20Plymouth=20splash,=20ensure=20pass?= =?UTF-8?q?word=20field=20doesn=E2=80=99t=20bump=20into=20the=20Debian=20i?= =?UTF-8?q?mage=20even=20for=20smaller=20height=20screens.=20(Closes:=20#7?= =?UTF-8?q?74226)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 8 ++++++++ lines-theme/plymouth/lines.script | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 70918f6..ccdb4cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +desktop-base (9.0.1) UNRELEASED; urgency=medium + + [ Aurélien COUDERC ] + * On Lines Plymouth splash, ensure password field doesn’t bump into the + Debian image even for smaller height screens. (Closes: #774226) + + -- Aurélien COUDERC Tue, 03 Jan 2017 21:50:10 +0100 + desktop-base (9.0.0) unstable; urgency=medium [ Aurélien COUDERC ] diff --git a/lines-theme/plymouth/lines.script b/lines-theme/plymouth/lines.script index 7366516..43ab288 100644 --- a/lines-theme/plymouth/lines.script +++ b/lines-theme/plymouth/lines.script @@ -213,6 +213,10 @@ fun TextYOffset() { if (y + text_height > min_height) y = min_height - text_height; + # Ensure we don’t bump into the Debian8 image. + # The approx height of the 3 text lines + password input is 140 px. + y = Math.Min(y, debian8_sprite.GetY() - 140); + return y; }