From 6e8cb23d3302d54420894128a811f6566e21d516 Mon Sep 17 00:00:00 2001 From: poire-z Date: Thu, 14 Jun 2018 21:53:43 +0200 Subject: [PATCH] bump crengine: fix drawing position of bottom and right borders (#4013) Also let tap propagate when a Notification is displayed. --- base | 2 +- frontend/ui/widget/notification.lua | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/base b/base index 03b4670a2..d1d11d157 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 03b4670a2cd7fbdcc7d47783e67fb459277f9166 +Subproject commit d1d11d157e90ce88bcc3837a82345e8256eabe3c diff --git a/frontend/ui/widget/notification.lua b/frontend/ui/widget/notification.lua index d52134581..2a7da993a 100644 --- a/frontend/ui/widget/notification.lua +++ b/frontend/ui/widget/notification.lua @@ -92,14 +92,18 @@ end function Notification:onAnyKeyPressed() -- triggered by our defined key events UIManager:close(self) - if self.readonly ~= true then + if not self.timeout then return true end end function Notification:onTapClose() UIManager:close(self) - if self.readonly ~= true then + -- If timeout (usually 1s or 2s), let it propagate so an underlying + -- widget can process the tap whether it's done at 1.9s or 2.1s + -- If no timout, don't propagate as this tap is most probably meant + -- at dismissing the notification + if not self.timeout then return true end end