From dd92daa60ff0b34beffde6db9ac6207d065df374 Mon Sep 17 00:00:00 2001 From: cuu Date: Fri, 21 Jun 2019 12:44:34 +0800 Subject: [PATCH 1/2] add DrawRect in multi_icon_item --- Menu/GameShell/10_Settings/About/__init__.py | 13 ++++++++----- sys.py/UI/multi_icon_item.py | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py index ab8b654..e100d87 100644 --- a/Menu/GameShell/10_Settings/About/__init__.py +++ b/Menu/GameShell/10_Settings/About/__init__.py @@ -16,7 +16,7 @@ from UI.util_funcs import midRect,FileExists from UI.keys_def import CurKeys, IsKeyMenuOrB from UI.scroller import ListScroller from UI.icon_pool import MyIconPool -from UI.icon_item import IconItem +from UI.multi_icon_item import MultiIconItem from UI.multilabel import MultiLabel from UI.lang_manager import MyLangManager from UI.skin_manager import MySkinManager @@ -280,7 +280,7 @@ class AboutPage(Page): self._Width = self._Screen._Width ## equal to screen width self._Height = self._Screen._Height - bgpng = IconItem() + bgpng = MultiIconItem() bgpng._ImgSurf = MyIconPool.GiveIconSurface("about_bg") bgpng._MyType = ICON_TYPES["STAT"] bgpng._Parent = self @@ -350,14 +350,17 @@ class AboutPage(Page): self.ClearCanvas() #self._Ps.Draw() - self._Icons["bg"].NewCoord(self._Width/2,self._Height/2 + (self._BGheight - Height)/2 + self._Screen._TitleBar._Height) - self._Icons["bg"].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)) + if self._HWND != None: self._HWND.fill(MySkinManager.GiveColor("White")) diff --git a/sys.py/UI/multi_icon_item.py b/sys.py/UI/multi_icon_item.py index 58b2af1..9400b46 100644 --- a/sys.py/UI/multi_icon_item.py +++ b/sys.py/UI/multi_icon_item.py @@ -43,7 +43,11 @@ class MultiIconItem(IconItem): self._PosY+self._Parent._PosY, self._Width,self._Height), (0,self._IconIndex*self._IconHeight,self._IconWidth,self._IconHeight)) - + + def DrawRect(self,rect1,rect2): + if self._ImgSurf != None: + self._Parent._CanvasHWND.blit(self._ImgSurf,rect1,rect2) + def Draw(self): if self._Align==ALIGN["VCenter"]: #default if self._Label != None: From 3ad1c48fce4ea2af6e1e60e672e88571898dca9b Mon Sep 17 00:00:00 2001 From: cuu Date: Fri, 21 Jun 2019 13:18:31 +0800 Subject: [PATCH 2/2] stretch canvas of about --- Menu/GameShell/10_Settings/About/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Menu/GameShell/10_Settings/About/__init__.py b/Menu/GameShell/10_Settings/About/__init__.py index e100d87..4a5c0c3 100644 --- a/Menu/GameShell/10_Settings/About/__init__.py +++ b/Menu/GameShell/10_Settings/About/__init__.py @@ -274,7 +274,7 @@ class AboutPage(Page): if self._Screen != None: if self._Screen._CanvasHWND != None and self._CanvasHWND == None: self._HWND = self._Screen._CanvasHWND - self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight) ) + self._CanvasHWND = pygame.Surface( (self._Screen._Width,self._BGheight+50) ) self._PosX = self._Index*self._Screen._Width self._Width = self._Screen._Width ## equal to screen width @@ -307,7 +307,7 @@ class AboutPage(Page): def ScrollDown(self): dis = 10 - if abs(self._Scrolled) < (self._BGheight - self._Height)/2 + 50: + if abs(self._Scrolled) < (self._BGheight - self._Height)/2 + 100: self._PosY -= dis self._Scrolled -= dis