Update About (Sync Ver.200626)

This commit is contained in:
hi80482 2020-07-03 14:57:00 +08:00 committed by GitHub
parent 038e33410c
commit 27215cf05a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,7 +41,6 @@ class InfoPageListItem(object):
self._Fonts = {}
def SetSmallText(self,text):
l = MultiLabel()
l.SetCanvasHWND(self._Parent._CanvasHWND)
l.Init(text,self._Fonts["small"])
@ -80,7 +79,7 @@ class InfoPageListItem(object):
class AboutPage(Page):
_FootMsg = ["Nav.","","","Back",""]
_MyList = []
_ListFontObj = MyLangManager.TrFont("varela13")
_ListFontObj = MyLangManager.TrFont("Eurostile13")
_AList = {}
@ -89,7 +88,7 @@ class AboutPage(Page):
_BGwidth = 320
_BGheight = 300
_DrawOnce = False
#_DrawOnce = False
_Scroller = None
def __init__(self):
@ -200,7 +199,7 @@ class AboutPage(Page):
if line.startswith("MemTotal"):
parts = line.split(":")
parts[1] = parts[1].replace("kB","")
print( parts[1].strip() )
#print( parts[1].strip() )
memory = {}
memory["key"] = "memory"
@ -275,7 +274,6 @@ class AboutPage(Page):
if self._Screen._CanvasHWND != None and self._CanvasHWND == None:
self._HWND = self._Screen._CanvasHWND
self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight+50) )
self._CanvasHWND_Wallpaper = pygame.Surface( (self._Screen._Width,self._Screen._Height) )
self._PosX = self._Index*self._Screen._Width
self._Width = self._Screen._Width ## equal to screen width
@ -318,11 +316,10 @@ class AboutPage(Page):
self._PosY += dis
self._Scrolled += dis
def OnLoadCb(self):
self._Scrolled = 0
self._PosY = 0
self._DrawOnce = False
#self._DrawOnce = False
def OnReturnBackCb(self):
self.ReturnToUpLevelPage()
@ -346,21 +343,31 @@ class AboutPage(Page):
def Draw(self):
# if self._DrawOnce == False:
if self._DrawOnce == False:
# self.ClearCanvas()
##self._Ps.Draw()
# for i in self._MyList:
# i.Draw()
# self._DrawOnce = True
# self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184))
# y = self._MyList[len(self._MyList)-1]._PosY+30
# self._Icons["bg"].DrawRect(( (self._Width-191)/2,y,191,68),(65,232,191,68))
# always redraw
if self._Wallpaper:
self._CanvasHWND.fill((0,0,0,))
self._CanvasHWND.set_colorkey((0,0,0))
self._CanvasHWND.blit(self._Wallpaper,(0, self._PosY * -1))
else:
self._CanvasHWND.fill(MySkinManager.GiveColor("White"))
#self._Ps.Draw()
self.ClearCanvas()
for i in self._MyList:
i.Draw()
self._DrawOnce = True
self._Icons["bg"].DrawRect((230,0,82,184),(228,0,82,184))
y = self._MyList[len(self._MyList)-1]._PosY+30
@ -370,19 +377,11 @@ class AboutPage(Page):
if self._HWND != None:
self._HWND.fill(MySkinManager.GiveColor("White"))
if self._Wallpaper:
self._CanvasHWND_Wallpaper.blit(self._Wallpaper,(0,0))
self._CanvasHWND_Wallpaper.blit(self._CanvasHWND,(self._PosX,self._PosY,self._Width, self._Height ))
self._HWND.blit(self._CanvasHWND_Wallpaper,(0,0,self._Width, self._Height ) )
else:
self._HWND.blit(self._CanvasHWND, (self._PosX, self._PosY, self._Width, self._Height ))
self._Scroller.UpdateSize(self._BGheight,abs(self._Scrolled)*3)
self._Scroller.Draw()
class APIOBJ(object):
_Page = None
@ -405,5 +404,3 @@ def Init(main_screen):
OBJ.Init(main_screen)
def API(main_screen):
OBJ.API(main_screen)