SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

使用安全区域显示系统时间

Browse Source
This commit is contained in:
MrZ626
2020-12-10 12:49:19 +08:00
parent 7ed0248032
commit 35e09b3acd
2 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Zframework/init.lua
View File

@@ -48,7 +48,7 @@ local function updatePowerInfo()
if state=="nobattery"then if state=="nobattery"then
gc.setColor(1,1,1) gc.setColor(1,1,1)
gc.setLineWidth(2) gc.setLineWidth(2)
gc.line(74,5,100,22) gc.line(74,SCR.safeX+5,100,22)
elseif pow then elseif pow then
if charging then gc.setColor(0,1,0) if charging then gc.setColor(0,1,0)
elseif pow>50 then gc.setColor(1,1,1) elseif pow>50 then gc.setColor(1,1,1)
@@ -310,19 +310,7 @@ function love.lowmemory()
collectgarbage() collectgarbage()
end end
function love.resize(w,h) function love.resize(w,h)
SCR.w,SCR.h,SCR.dpi=w,h,gc.getDPIScale() SCR.resize(w,h)
SCR.W,SCR.H=SCR.w*SCR.dpi,SCR.h*SCR.dpi
SCR.r=h/w
SCR.rad=(w^2+h^2)^.5
if SCR.r>=SCR.h0/SCR.w0 then
SCR.k=w/SCR.w0
SCR.x,SCR.y=0,(h-w*SCR.h0/SCR.w0)/2
else
SCR.k=h/SCR.h0
SCR.x,SCR.y=(w-h*SCR.w0/SCR.h0)/2,0
end
xOy:setTransformation(w/2,h/2,nil,SCR.k,nil,SCR.w0/2,SCR.h0/2)
if BG.resize then BG.resize(w,h)end if BG.resize then BG.resize(w,h)end
SHADER.warning:send("w",w*SCR.dpi) SHADER.warning:send("w",w*SCR.dpi)
@@ -515,7 +503,7 @@ function love.run()
--Draw power info. --Draw power info.
gc.setColor(1,1,1) gc.setColor(1,1,1)
if SETTING.powerInfo then if SETTING.powerInfo then
gc.draw(infoCanvas,0,0,0,SCR.k) gc.draw(infoCanvas,SCR.safeX,0,0,SCR.k)
end end
--Draw scene swapping animation --Draw scene swapping animation
@@ -535,16 +523,16 @@ function love.run()
gc.setColor(1,1,1) gc.setColor(1,1,1)
setFont(15) setFont(15)
_=SCR.h _=SCR.h
gc.print(FPS(),5,_-20) gc.print(FPS(),SCR.safeX+5,_-20)
--Debug info. --Debug info.
if devMode then if devMode then
gc.setColor(devColor[devMode]) gc.setColor(devColor[devMode])
gc.print("Memory:"..gcinfo(),5,_-40) gc.print("Memory:"..gcinfo(),SCR.safeX+5,_-40)
gc.print("Lines:"..FREEROW.getCount(),5,_-60) gc.print("Lines:"..FREEROW.getCount(),SCR.safeX+5,_-60)
gc.print("Cursor:"..int(mx+.5).." "..int(my+.5),5,_-80) gc.print("Cursor:"..int(mx+.5).." "..int(my+.5),SCR.safeX+5,_-80)
gc.print("Voices:"..VOC.getCount(),5,_-100) gc.print("Voices:"..VOC.getCount(),SCR.safeX+5,_-100)
gc.print("Tasks:"..TASK.getCount(),5,_-120) gc.print("Tasks:"..TASK.getCount(),SCR.safeX+5,_-120)
ins(frameTimeList,1,dt)rem(frameTimeList,126) ins(frameTimeList,1,dt)rem(frameTimeList,126)
gc.setColor(1,1,1,.3) gc.setColor(1,1,1,.3)
for i=1,#frameTimeList do for i=1,#frameTimeList do

32
Zframework/screen.lua
View File

@@ -1,14 +1,32 @@
local SCR={ local SCR={
w0=1280,h0=720,--Default Screen Size w0=1280,h0=720, --Default Screen Size
x=0,y=0,--Up-left Coord on screen x=0,y=0, --Up-left Coord on screen
w=0,h=0,--Fullscreen w/h in gc w=0,h=0, --Fullscreen w/h in gc
W=0,H=0,--Fullscreen w/h in shader W=0,H=0, --Fullscreen w/h in shader
rad=0,--Radius safeX=0,safeY=0,--Safe area
k=1,--Scale size safeW=0,safeH=0,--Safe area
dpi=1,--DPI from gc.getDPIScale() rad=0, --Radius
k=1, --Scale size
dpi=1, --DPI from gc.getDPIScale()
xOy=love.math.newTransform(),--Screen transformation object xOy=love.math.newTransform(),--Screen transformation object
} }
function SCR.setSize(w,h) function SCR.setSize(w,h)
SCR.w0,SCR.h0=w,h SCR.w0,SCR.h0=w,h
end end
function SCR.resize(w,h)
SCR.w,SCR.h,SCR.dpi=w,h,love.graphics.getDPIScale()
SCR.W,SCR.H=SCR.w*SCR.dpi,SCR.h*SCR.dpi
SCR.r=h/w
SCR.rad=(w^2+h^2)^.5
if SCR.r>=SCR.h0/SCR.w0 then
SCR.k=w/SCR.w0
SCR.x,SCR.y=0,(h-w*SCR.h0/SCR.w0)/2
else
SCR.k=h/SCR.h0
SCR.x,SCR.y=(w-h*SCR.w0/SCR.h0)/2,0
end
SCR.safeX,SCR.safeY,SCR.safeW,SCR.safeH=love.window.getSafeArea()
SCR.xOy:setTransformation(w/2,h/2,nil,SCR.k,nil,SCR.w0/2,SCR.h0/2)
end
return SCR return SCR