1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00

- cardset prepare option changes (android build)

- action against occasional black screen on android resume
- startup phase cosmetics
This commit is contained in:
lufebe16 2024-02-07 18:13:25 +01:00
parent b42a43fb0f
commit cba1fd815f
4 changed files with 18 additions and 13 deletions

View file

@ -7,6 +7,7 @@ cardset-dojouji-3x3
cardset-dondorf cardset-dondorf
cardset-eternal-dragon-10x10 cardset-eternal-dragon-10x10
cardset-gnome-mahjongg-1 cardset-gnome-mahjongg-1
cardset-gpl
cardset-hanafuda-200-years cardset-hanafuda-200-years
cardset-hexadeck cardset-hexadeck
cardset-hofamterspiel-9x9 cardset-hofamterspiel-9x9
@ -30,3 +31,4 @@ cardset-tuxedo
cardset-uni-mahjongg cardset-uni-mahjongg
cardset-victoria-falls-5x5 cardset-victoria-falls-5x5
cardset-vienna-2k cardset-vienna-2k
cardset-z_minimal

View file

@ -2,7 +2,7 @@
#set -eux #set -eux
#loadmode="forge" #loadmode="forge"
loadmode="" loadmode=" "
rm -rf cardsets rm -rf cardsets
@ -46,7 +46,7 @@ else
pushd repo pushd repo
git init git init
git remote add -t master origin https://github.com/shlomif/PySolFC-Cardsets.git git remote add -t master origin https://github.com/shlomif/PySolFC-Cardsets.git
git fetch --depth 1 origin b153255935a5376da6151b55bc8044f1131c7950 git fetch --depth 1 origin 9b63a583dc3e770fa9bf8f2378c37a064aa4969c
git checkout -q FETCH_HEAD git checkout -q FETCH_HEAD
popd popd

View file

@ -7,8 +7,8 @@ import math
carddir = "" carddir = ""
filename = "" filename = ""
maxw = 120 maxw = 100
maxh = 180 maxh = 150
# arguments: # arguments:
# 1: cardset directory # 1: cardset directory

View file

@ -1854,8 +1854,8 @@ class LApp(App):
self.rect.pos = self.pos self.rect.pos = self.pos
self.rect.size = self.size self.rect.size = self.size
self.startLabel = MyLabel(text="PySolFC", color=[0.9,0.9,0.9,1]) # noqa #self.startLabel = MyLabel(text="PySolFC", color=[0.9,0.9,0.9,1]) # noqa
self.baseWindow.add_widget(self.startLabel) #self.baseWindow.add_widget(self.startLabel)
return self.baseWindow return self.baseWindow
@ -1887,11 +1887,10 @@ class LApp(App):
logging.info("LApp: app_start processed, returned to kivy mainloop") logging.info("LApp: app_start processed, returned to kivy mainloop")
self.baseWindow.add_widget(self.mainWindow,index=1) # noqa self.baseWindow.add_widget(self.mainWindow,index=1) # noqa
anim = Animation(opacity=0,duration=0.5) # noqa self.baseWindow.opacity = 0
anim.start(self.startLabel) anim = Animation(opacity=1,duration=0.7) # noqa
Clock.schedule_once(lambda dt: Clock.schedule_once(lambda dt: anim.start(self.baseWindow),0.3) # noqa
self.baseWindow.remove_widget(self.startLabel),1.0) # noqa Clock.schedule_once(lambda dt: set_fullscreen(True),0.0) # noqa
Clock.schedule_once(lambda dt: set_fullscreen(True),2.0) # noqa
def on_start(self): def on_start(self):
logging.info("LApp: on_start") logging.info("LApp: on_start")
@ -2040,8 +2039,12 @@ class LApp(App):
# einwandfrei. Daher versuchen wir ... um den graphik context # einwandfrei. Daher versuchen wir ... um den graphik context
# wieder zu aktivieren/auszurichten: # wieder zu aktivieren/auszurichten:
Clock.schedule_once(lambda dt: self.mainWindow.rebuildContainer(), 1.0) # gemäss einer neueren Antwort auf kivy issue 3671 gehört auch
Clock.schedule_once(lambda dt: set_fullscreen(True),2.0) # noqa # update-viewport zu den nützlichen massnahmen.
Clock.schedule_once(lambda dt: Window.update_viewport(),0.0) # noqa
Clock.schedule_once(lambda dt: self.mainWindow.rebuildContainer(), 0.5)
Clock.schedule_once(lambda dt: set_fullscreen(True),1.0) # noqa
# Pause modus abschalten nach resume: # Pause modus abschalten nach resume:
if app.game.pause: if app.game.pause: