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

Merge pull request #2767 from PySimpleGUI/Dev-latest 

back out part of scrolled column fix as it was scrolling everything i…
This commit is contained in:
PySimpleGUI 2020-04-03 15:31:00 -04:00 committed by GitHub
parent 7e431993ef 20435d98b1
commit 1b5828a37f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.18.0.12 Unreleased - Print and MLine.Print fixed sep char handling, popup_get_date, icon parm popup_animated, popup button size (6,1), NEW CALENDAR chooser integrated, Graph.draw_lines, color chooser set parent window, scrollable column scrollwheel fixed, autoscroll parm for Multiline.print" version = __version__ = "4.18.0.13 Unreleased - Print and MLine.Print fixed sep char handling, popup_get_date, icon parm popup_animated, popup button size (6,1), NEW CALENDAR chooser integrated, Graph.draw_lines, color chooser set parent window, scrollable column scrollwheel fixed, autoscroll parm for Multiline.print"
port = 'PySimpleGUI' port = 'PySimpleGUI'
@ -5137,13 +5137,13 @@ class TkScrollableFrame(tk.Frame):
# Canvas can be: master, canvas, TKFrame # Canvas can be: master, canvas, TKFrame
if sys.platform.startswith('linux'): if sys.platform.startswith('linux'):
self.canvas.bind_all('<4>', self.yscroll, add='+') self.canvas.bind('<4>', self.yscroll, add='+')
self.canvas.bind_all('<5>', self.yscroll, add='+') self.canvas.bind('<5>', self.yscroll, add='+')
else: else:
# Windows and MacOS # Windows and MacOS
self.canvas.bind_all("<MouseWheel>", self.yscroll, add='+') self.canvas.bind("<MouseWheel>", self.yscroll, add='+')
self.canvas.bind_all("<Shift-MouseWheel>", self.xscroll, add='+') self.canvas.bind("<Shift-MouseWheel>", self.xscroll, add='+')
self.bind('<Configure>', self.set_scrollregion) self.canvas.bind('<Configure>', self.set_scrollregion)
def resize_frame(self, e): def resize_frame(self, e):
self.canvas.itemconfig(self.frame_id, height=e.height, width=e.width) self.canvas.itemconfig(self.frame_id, height=e.height, width=e.width)