Merge pull request #731 from WS64/master

Add white borders to Kobo Aura because of obscuration by black bezel

frontend/ui/device/screen.lua

@@ -55,6 +55,8 @@ function Screen:init()
         function Screen:getHeight()
             return Screen:getHeightBB()
         end
+        function self:offsetX() return 0 end
+        function self:offsetY() return 0 end
     else
         function Screen:getSize()
             return Screen:getSizePhoenix()
@@ -65,6 +67,16 @@ function Screen:init()
         function Screen:getHeight()
             return Screen:getHeightPhoenix()
         end
+        function self:offsetX()
+            if Screen.cur_rotation_mode == 0 then
+                return 6
+            else
+                return 12
+            end
+        end
+        function self:offsetY()
+            return 1
+        end
     end
     self.blitbuffer_rotation_mode = self.bb:getRotation()
     -- asking the framebuffer for orientation is error prone,
@@ -77,8 +89,19 @@ function Screen:init()
     self.cur_rotation_mode = self.native_rotation_mode
 end
 
+function Screen:PhoenixBezelCleaner()
+    -- bb.paintRect(x, y, w, h, color)
+    self.bb:paintRect(0,0, Screen:getWidth(), Screen:offsetY() , 0 )
+    self.bb:paintRect(0,0, Screen:offsetX(), Screen:getHeight(), 0 )
+    self.bb:paintRect(Screen:getWidth() + Screen:offsetX(), 0 , Screen:getWidth() - Screen:getWidth() - Screen:offsetX(), Screen:getHeight(), 0 )
+    self.bb:paintRect(0, Screen:getHeight() + Screen:offsetY(), Screen:offsetX(), Screen:getWidth(), 0 )
+end
+
 function Screen:refresh(refresh_type, waveform_mode, x, y, w, h)
     self.fb:refresh(refresh_type, waveform_mode, x, y, w, h)
+    if self.device:getModel() == 'Kobo_phoenix' and refresh_type == 1 then
+        Screen:PhoenixBezelCleaner()
+    end
 end
 
 function Screen:getSizeBB()

frontend/ui/uimanager.lua

@@ -61,27 +61,9 @@ local UIManager = {
 function UIManager:init()
     -- For the Kobo Aura an offset is needed, because the bezel make the
     -- visible screen smaller.
-    if Device:getModel() ~= 'Kobo_phoenix' then
-        function self:offsetX() return 0 end
-        function self:offsetY() return 0 end
-    else
-        function self:offsetX()
-            if Screen.cur_rotation_mode == 0 then
-                return 4
-            elseif Screen.cur_rotation_mode == 1 then
-                return 15
-            else
-                return 3
-            end
-        end
-        function self:offsetY()
-            if Screen.cur_rotation_mode == 0 then
-                return 3
-            else
-                return 4
-            end
-        end
-    end
+    
+    function self:offsetX() return Screen:offsetX() end
+    function self:offsetY() return Screen:offsetY() end
 
     self.event_handlers = {
         __default__ = function(input_event)