mlaga97
/
PySimpleGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1081 from PySimpleGUI/Dev-latest 

Dev latest
This commit is contained in:
MikeTheWatchGuy 2019-01-16 16:43:34 -05:00 committed by GitHub
parent af94e29b2f e0d3fb3f73
commit 61e67a72ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
PySimpleGUI.py
View File

@ -1608,6 +1608,7 @@ class Button(Element):
should_submit_window = False should_submit_window = False
root = tk.Toplevel() root = tk.Toplevel()
root.title('Calendar Chooser') root.title('Calendar Chooser')
root.wm_attributes("-topmost", 1)
self.TKCal = TKCalendar(master=root, firstweekday=calendar.SUNDAY, target_element=target_element, close_when_chosen=self.CalendarCloseWhenChosen, default_date=self.DefaultDate_M_D_Y ) self.TKCal = TKCalendar(master=root, firstweekday=calendar.SUNDAY, target_element=target_element, close_when_chosen=self.CalendarCloseWhenChosen, default_date=self.DefaultDate_M_D_Y )
self.TKCal.pack(expand=1, fill='both') self.TKCal.pack(expand=1, fill='both')
root.update() root.update()
@ -1854,6 +1855,7 @@ class Image(Element):
self.AnimatedFrames = None self.AnimatedFrames = None
self.CurrentFrameNumber = 0 self.CurrentFrameNumber = 0
self.TotalAnimatedFrames = 0 self.TotalAnimatedFrames = 0
self.LastFrameTime = 0
super().__init__(ELEM_TYPE_IMAGE, size=size, background_color=background_color, pad=pad, key=key, super().__init__(ELEM_TYPE_IMAGE, size=size, background_color=background_color, pad=pad, key=key,
tooltip=tooltip, visible=visible) tooltip=tooltip, visible=visible)
@ -1878,7 +1880,7 @@ class Image(Element):
elif visible is True: elif visible is True:
self.tktext_label.pack() self.tktext_label.pack()
def UpdateAnimation(self, source, size=(None, None)): def UpdateAnimation(self, source, size=(None, None), time_between_frames=0):
if self.AnimatedFrames is None: if self.AnimatedFrames is None:
self.AnimatedFrames = [] self.AnimatedFrames = []
for i in range(1000): for i in range(1000):
@ -1895,8 +1897,20 @@ class Image(Element):
if size != (None, None): if size != (None, None):
self.AnimatedFrames[i].configure self.AnimatedFrames[i].configure
self.TotalAnimatedFrames += 1 self.TotalAnimatedFrames += 1
self.LastFrameTime = time.time()
# show the frame # show the frame
self.CurrentFrameNumber = self.CurrentFrameNumber + 1 if self.CurrentFrameNumber+1< self.TotalAnimatedFrames else 0
now = time.time()
if time_between_frames:
if (now - self.LastFrameTime) * 1000 > time_between_frames:
self.LastFrameTime = now
self.CurrentFrameNumber = self.CurrentFrameNumber + 1 if self.CurrentFrameNumber+1< self.TotalAnimatedFrames else 0
else: # don't reshow the frame again if not time for new frame
return
else:
self.CurrentFrameNumber = self.CurrentFrameNumber + 1 if self.CurrentFrameNumber+1< self.TotalAnimatedFrames else 0
self.tktext_label.configure(image=self.AnimatedFrames[self.CurrentFrameNumber]) self.tktext_label.configure(image=self.AnimatedFrames[self.CurrentFrameNumber])
@ -5687,6 +5701,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form:Window):
ttk.Style().configure("Treeview", foreground=element.TextColor) ttk.Style().configure("Treeview", foreground=element.TextColor)
if element.RowHeight is not None: if element.RowHeight is not None:
ttk.Style().configure("Treeview", rowheight=element.RowHeight) ttk.Style().configure("Treeview", rowheight=element.RowHeight)
ttk.Style().configure("Treeview", font=font)
# scrollable_frame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both') # scrollable_frame.pack(side=tk.LEFT, padx=elementpad[0], pady=elementpad[1], expand=True, fill='both')
treeview.bind("<<TreeviewSelect>>", element.treeview_selected) treeview.bind("<<TreeviewSelect>>", element.treeview_selected)
if element.BindReturnKey: if element.BindReturnKey: