Merge pull request #190 from cuu/gcores

colors fix
This commit is contained in:
GNU 2019-05-05 14:43:04 +08:00 committed by GitHub
commit f58d8218c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 17 deletions

View File

@ -71,7 +71,7 @@ class BleForgetConfirmPage(ConfirmPage):
class BleInfoPageSelector(PageSelector): class BleInfoPageSelector(PageSelector):
_BackgroundColor = MySkinManager.GiveColor('Front') _BackgroundColor = MySkinManager.GiveColor('Line')
def __init__(self): def __init__(self):
self._PosX = 0 self._PosX = 0
@ -92,8 +92,9 @@ class BleInfoPageSelector(PageSelector):
self._PosY = y self._PosY = y
self._Height = h self._Height = h
aa_round_rect(self._Parent._CanvasHWND, #aa_round_rect(self._Parent._CanvasHWND,
(x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0)
class BleInfoPage(Page): class BleInfoPage(Page):
_FootMsg = ["Nav","Forget","Disconnect","Back",""] _FootMsg = ["Nav","Forget","Disconnect","Back",""]
@ -315,7 +316,7 @@ class BleInfoPage(Page):
class BleListSelector(PageSelector): class BleListSelector(PageSelector):
_BackgroundColor = MySkinManager.GiveColor('Front') _BackgroundColor = MySkinManager.GiveColor('Line')
def __init__(self): def __init__(self):
self._PosX = 0 self._PosX = 0
@ -336,8 +337,9 @@ class BleListSelector(PageSelector):
self._PosY = y self._PosY = y
self._Height = h self._Height = h
aa_round_rect(self._Parent._CanvasHWND, #aa_round_rect(self._Parent._CanvasHWND,
(x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor, (x,y,self._Width-4,h),0 )
class BleListMessageBox(Label): class BleListMessageBox(Label):
_Parent = None _Parent = None
@ -351,7 +353,7 @@ class BleListMessageBox(Label):
padding = 10 padding = 10
pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(x-padding,y-padding, w+padding*2,h+padding*2)) pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('White'),(x-padding,y-padding, w+padding*2,h+padding*2))
pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Black'),(x-padding,y-padding, w+padding*2,h+padding*2),1) pygame.draw.rect(self._CanvasHWND,MySkinManager.GiveColor('Text'),(x-padding,y-padding, w+padding*2,h+padding*2),1)
self._CanvasHWND.blit(my_text,(x,y,w,h)) self._CanvasHWND.blit(my_text,(x,y,w,h))

View File

@ -24,7 +24,7 @@ from UI.lang_manager import MyLangManager
import config import config
class ListPageSelector(PageSelector): class ListPageSelector(PageSelector):
_BackgroundColor = MySkinManager.GiveColor('Front') _BackgroundColor = MySkinManager.GiveColor('Line')
def __init__(self): def __init__(self):
self._PosX = 0 self._PosX = 0
@ -47,9 +47,9 @@ class ListPageSelector(PageSelector):
self._PosY = y self._PosY = y
self._Height = h self._Height = h
aa_round_rect(self._Parent._CanvasHWND, #aa_round_rect(self._Parent._CanvasHWND,
(x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor) # (x,y,self._Width-4,h),self._BackgroundColor,4,0,self._BackgroundColor)
pygame.draw.rect(self._Parent._CanvasHWND,self._BackgroundColor,(x,y,self._Width-4,h),0 )
class PageListItem(object): class PageListItem(object):
_PosX = 0 _PosX = 0

View File

@ -63,11 +63,11 @@ class ListPage(Page):
["","Notification","Notification"], ["","Notification","Notification"],
["","Update", ""], ["","Update", ""],
["","About", "About"], ["","About", "About"],
["","PowerOFF","Power off"], ["","PowerOFF","Power OFF"],
["","ButtonsLayout","Buttons Layout"], ["","ButtonsLayout","Buttons Layout"],
#["","LauncherGo","Switch to LauncherGo"], #["","LauncherGo","Switch to LauncherGo"],
["","Lima","GPU driver switch"], ["","Lima","GPU Driver Switch"],
["","GateWay","Network gateway switch"]] ["","GateWay","Network Gateway Switch"]]
start_x = 0 start_x = 0
start_y = 0 start_y = 0

View File

@ -3,7 +3,6 @@
"InstallDir":"pico-8", "InstallDir":"pico-8",
"NotFoundMsg":["Please purchase the PICO-8 \n|None|varela16", "NotFoundMsg":["Please purchase the PICO-8 \n|None|varela16",
"and copy it to the \"~/games/PICO-8\"|None|varela16"], "and copy it to the \"~/games/PICO-8\"|None|varela16"],
"MD5":{"pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2","pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932","pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e","pico-8_0.1.12c_raspi.zip":"1a62b0d7d4e4be65f89f23ec9757cb66","pico-8.zip":"whatever it takes"},
"MD5":{"pico-8_0.1.11g_raspi.zip":"a3f2995cf117499f880bd964d6a0e1f2","pico-8_0.1.11g_amd64.zip":"6726141c784afd4a41be6b7414c1b932","pico-8_0.1.12_raspi.zip":"08eda95570e63089a2b9f5531503431e","pico-8_0.1.12c_raspi.zip":"1a62b0d7d4e4be65f89f23ec9757cb66"},
"Post-Up":"bash Post-Up.sh" "Post-Up":"bash Post-Up.sh"
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB