added safeArea constants

uralys · May 31, 2020 · 9cfa42c · 9cfa42c
1 parent 3ae08ae
commit 9cfa42c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/.luacheckrc b/.luacheckrc
@@ -25,8 +25,12 @@ stds.cherry = {
     'string',
     'table',
     'unpack',
+    'FULL_W',
+    'FULL_H',
     'W',
-    'H'
+    'H',
+    'TOP',
+    'BOTTOM'
   }
 }
 

diff --git a/cherry/components/background.lua b/cherry/components/background.lua
@@ -60,7 +60,7 @@ function Background:init(options)
   )
 
   if (options.color) then
-    self.bg = display.newRect(W / 2, H / 2, W, H)
+    self.bg = display.newRect(FULL_W / 2, FULL_H / 2, FULL_W, FULL_H)
     self.bg:setFillColor(colorize(options.color))
   else
     local lightImage = options.light

diff --git a/cherry/main.lua b/cherry/main.lua
@@ -20,8 +20,19 @@ _G.Router = require 'cherry.core.router'
 
 --------------------------------------------------------------------------------
 
-_G.W = display.contentWidth
-_G.H = display.contentHeight
+_G.FULL_W = display.contentWidth
+_G.FULL_H = display.contentHeight
+
+_G.W = display.safeActualContentWidth
+_G.H = display.safeActualContentHeight
+
+_G.TOP = display.safeScreenOriginY
+_G.BOTTOM = display.safeScreenOriginY + display.safeActualContentHeight
+
+-- local safeArea = display.newRect(W / 2, TOP + H / 2, W, H)
+-- local colorize = require 'cherry.libs.colorize'
+-- safeArea:setFillColor(colorize('#fff'))
+-- safeArea.alpha = 0.2
 
 --------------------------------------------------------------------------------
 -- https://docs.coronalabs.com/tutorial/media/extendAnchors/index.html#extending-anchor-points-1