mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
Bugfix synchronisation issues with autodrop
Bugfix bottom image flip
This commit is contained in:
parent
2e81616028
commit
3e9b7b74c7
4 changed files with 9 additions and 3 deletions
|
@ -1896,8 +1896,7 @@ You have reached
|
||||||
if TOOLKIT == 'kivy':
|
if TOOLKIT == 'kivy':
|
||||||
if not self.app.opt.display_win_message:
|
if not self.app.opt.display_win_message:
|
||||||
return 1
|
return 1
|
||||||
from kivy.LApp import LAnimationManager
|
self.top.waitAnimation()
|
||||||
self.top.waitCondition(LAnimationManager.checkRunning)
|
|
||||||
if status == 2:
|
if status == 2:
|
||||||
top_msg = self.updateStats()
|
top_msg = self.updateStats()
|
||||||
time = self.getTime()
|
time = self.getTime()
|
||||||
|
|
|
@ -1355,6 +1355,9 @@ class LTkBase:
|
||||||
self.in_loop = False
|
self.in_loop = False
|
||||||
logging.info('LTkBase: wait condition end')
|
logging.info('LTkBase: wait condition end')
|
||||||
|
|
||||||
|
def waitAnimation(self):
|
||||||
|
self.waitCondition(LAnimationManager.checkRunning)
|
||||||
|
|
||||||
def tkraise(self):
|
def tkraise(self):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
|
@ -413,7 +413,7 @@ def _scaleTextureToSize(texture, size):
|
||||||
bpos = (bline + bk) * 4
|
bpos = (bline + bk) * 4
|
||||||
if (bk >= offx) and (bk < (width - offx)):
|
if (bk >= offx) and (bk < (width - offx)):
|
||||||
# transfer
|
# transfer
|
||||||
ak = gw - int((bk - offx) / scale) - 1
|
ak = int((bk - offx) / scale)
|
||||||
apos = (aline + ak) * 4
|
apos = (aline + ak) * 4
|
||||||
bb[bpos] = ag[apos]
|
bb[bpos] = ag[apos]
|
||||||
bb[bpos + 1] = ag[apos + 1]
|
bb[bpos + 1] = ag[apos + 1]
|
||||||
|
|
|
@ -1477,6 +1477,8 @@ class Stack:
|
||||||
if img is None:
|
if img is None:
|
||||||
return
|
return
|
||||||
# self.canvas.update_idletasks()
|
# self.canvas.update_idletasks()
|
||||||
|
if TOOLKIT is 'kivy':
|
||||||
|
self.game.top.waitAnimation()
|
||||||
item = MfxCanvasImage(self.canvas, card.x, card.y,
|
item = MfxCanvasImage(self.canvas, card.x, card.y,
|
||||||
image=img, anchor=ANCHOR_NW, group=self.group)
|
image=img, anchor=ANCHOR_NW, group=self.group)
|
||||||
# item.tkraise()
|
# item.tkraise()
|
||||||
|
@ -2908,6 +2910,8 @@ class WasteTalonStack(TalonStack):
|
||||||
self.game.moveMove(1, self, waste, frames=4, shadow=0)
|
self.game.moveMove(1, self, waste, frames=4, shadow=0)
|
||||||
else:
|
else:
|
||||||
self.game.moveMove(1, self, waste, frames=4, shadow=0)
|
self.game.moveMove(1, self, waste, frames=4, shadow=0)
|
||||||
|
if TOOLKIT is 'kivy':
|
||||||
|
self.game.top.waitAnimation()
|
||||||
self.fillStack()
|
self.fillStack()
|
||||||
elif waste.cards and self.round != self.max_rounds:
|
elif waste.cards and self.round != self.max_rounds:
|
||||||
if sound:
|
if sound:
|
||||||
|
|
Loading…
Add table
Reference in a new issue