From 923571ab70f887524fdb1ac31cdb36b072f491d2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 26 Sep 2013 16:45:28 -0500 Subject: LinHES-system: msg_daemon.py: initial support for y padding to compensate for displays that overscan alot. --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/msg_daemon.py | 17 +++++++++-------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index e05bcb3..098c17f 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.0 -pkgrel=24 +pkgrel=25 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -101,7 +101,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa' '4a3cd8f9b33b2b86fdba47a8f1fa2859' '16f079dab35dde6efd55bf6cf4e2fb2f' '3e60b17892e5b8214d47dcfddf5215a4' - '23c9ae11d9d058e2399283c197dfe9aa' + 'fd765fc7ee640221ed4801b4a629365f' 'ea315f41dcd6c978e546c95fc05546cf' 'ac61cc460d9e97ba1f5ef69e92cdfbe5' 'f3502bb7c665750da0ecdf6918f7c838' diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py index bbcebb3..1a855bc 100755 --- a/abs/core/LinHES-system/msg_daemon.py +++ b/abs/core/LinHES-system/msg_daemon.py @@ -20,6 +20,7 @@ class msg_aosd(): def scroll(self,osd, width, height, display_time,position): pos = position step = 1 + ypad = 0 osd.set_position(pos, width, height) (x, y, _, _) = osd.get_geometry() @@ -29,15 +30,15 @@ class msg_aosd(): x -= 1 - if pos < 3: #top positions - y -= height + 1; + if pos < 3: #top positions 0 to 2 + y -= height - 1 - ypad; for i in range(1, height + 1, step): osd.loop_for(5) y += step osd.set_geometry(x, y, width, height) - osd.set_position(pos, width, height) - osd.set_position_offset(-1, -1) + #osd.set_position(pos, width, height) + #osd.set_position_offset(-1, -1) (x, y, _, _) = osd.get_geometry() #time to display osd.loop_for(display_time) @@ -46,15 +47,15 @@ class msg_aosd(): osd.set_geometry(x, y, width, height); osd.loop_for(1); - else: #bottom positions - y += height - 1; + else: #bottom positions 3 to 8 + y += height + 1 - ypad; for i in range(1, height + 1, step): osd.loop_for(5) y -= step osd.set_geometry(x, y, width, i) - osd.set_position(pos, width, height) - osd.set_position_offset(-1, -1) + #osd.set_position(pos, width, height) + #osd.set_position_offset(-1, -1) (x, y, _, _) = osd.get_geometry() #time to display osd.loop_for(display_time) -- cgit v0.12