From 02ce0d7ecb2438e82793f3c81b8c329a47717a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Sun, 21 Mar 2021 15:09:47 +0100 Subject: [PATCH] Also fix plymouth text display in multi-screen configurations for previous themes: futureprototype, joy, lines, moonlight, softwaves (fixes more cases of #956426). --- debian/changelog | 3 +++ futureprototype-theme/plymouth/futureprototype.script | 2 +- joy-theme/plymouth/joy.script | 2 +- lines-theme/plymouth/lines.script | 2 +- moonlight-theme/plymouth/moonlight.script | 2 +- softwaves-theme/plymouth/softwaves.script | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5648312..b054861 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ desktop-base (11.0.3) UNRELEASED; urgency=medium * Also remove futurePrototype alternative for desktop-theme in prerm maintainer script. (Closes: #985267) * Fix Name metadata for homeworld theme’s wallpaper. + * Also fix plymouth text display in multi-screen configurations for previous + themes: futureprototype, joy, lines, moonlight, softwaves (fixes more + cases of #956426). -- Aurélien COUDERC Wed, 17 Mar 2021 22:57:01 +0100 diff --git a/futureprototype-theme/plymouth/futureprototype.script b/futureprototype-theme/plymouth/futureprototype.script index 1b57b77..08f8032 100644 --- a/futureprototype-theme/plymouth/futureprototype.script +++ b/futureprototype-theme/plymouth/futureprototype.script @@ -119,7 +119,7 @@ fun TextYOffset() { #Debug("y = " + y); text_height = first_line_height * 7.5; - min_height = Window.GetHeight(); + min_height = window_max.height; #Debug("text_height=" + text_height + "; min_height=" + min_height); if (y + text_height > min_height) diff --git a/joy-theme/plymouth/joy.script b/joy-theme/plymouth/joy.script index cb1a21d..9453326 100644 --- a/joy-theme/plymouth/joy.script +++ b/joy-theme/plymouth/joy.script @@ -114,7 +114,7 @@ fun TextYOffset() { text_height = first_line_height * 7.5; - min_height = Window.GetHeight(); + min_height = window_max.height; if (y + text_height > min_height) y = min_height - text_height; diff --git a/lines-theme/plymouth/lines.script b/lines-theme/plymouth/lines.script index 73f38e9..bc8837b 100644 --- a/lines-theme/plymouth/lines.script +++ b/lines-theme/plymouth/lines.script @@ -210,7 +210,7 @@ fun TextYOffset() { text_height = first_line_height * 7.5; - min_height = Window.GetHeight(); + min_height = window_max.height; if (y + text_height > min_height) y = min_height - text_height; diff --git a/moonlight-theme/plymouth/moonlight.script b/moonlight-theme/plymouth/moonlight.script index e534b9b..e92aacb 100644 --- a/moonlight-theme/plymouth/moonlight.script +++ b/moonlight-theme/plymouth/moonlight.script @@ -125,7 +125,7 @@ fun TextYOffset() { #Debug("y = " + y); text_height = first_line_height * 7.5; - min_height = Window.GetHeight(); + min_height = window_max.height; #Debug("text_height=" + text_height + "; min_height=" + min_height); if (y + text_height > min_height) diff --git a/softwaves-theme/plymouth/softwaves.script b/softwaves-theme/plymouth/softwaves.script index 42e126d..900afe8 100644 --- a/softwaves-theme/plymouth/softwaves.script +++ b/softwaves-theme/plymouth/softwaves.script @@ -118,7 +118,7 @@ fun TextYOffset() { #Debug("y = " + y); text_height = first_line_height * 7.5; - min_height = Window.GetHeight(); + min_height = window_max.height; #Debug("text_height=" + text_height + "; min_height=" + min_height); if (y + text_height > min_height)