Merge pull request #4236 from PySimpleGUI/Dev-latest · gitrymt/PySimpleGUI@d6a4769 · GitHub

gitrymt / PySimpleGUI Public

forked from PySimpleGUI/PySimpleGUI

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit d6a4769

Browse filesBrowse the repository at this point in the historyBrowse files

PySimpleGUI

authored

Merge pull request PySimpleGUI#4236 from PySimpleGUI/Dev-latest

Fix for scrollable column still scrolling despite contents being smal…

2 parents 91f6e90 + 48530f1 commit d6a4769
Copy full SHA for d6a4769

2 files changed

+5-3Lines changed: 5 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• DemoPrograms
  • Demo_OpenCV_4_Line_Program.py
• PySimpleGUI.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎DemoPrograms/Demo_OpenCV_4_Line_Program.py‎

Copy file name to clipboard

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -1,4 +1,4 @@
1	1	import cv2, PySimpleGUI as sg
2		- window, cap = sg.Window('Demo Application - OpenCV Integration', [[sg.Image(filename='', key='image')], ], location=(800, 400)), cv2.VideoCapture(0)
	2	+ window, cap = sg.Window('Demo Application - OpenCV Integration', [[sg.Image(key='-IMAGE-')], ], location=(800, 400)), cv2.VideoCapture(0)
3	3	while window(timeout=20)[0] is not None:
4		- window['image'](data=cv2.imencode('.png', cap.read()[1])[1].tobytes())
	4	+ window['-IMAGE-'](data=cv2.imencode('.png', cap.read()[1])[1].tobytes())

Collapse file

‎PySimpleGUI.py‎

Copy file name to clipboardExpand all lines: PySimpleGUI.py

+3-1Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -1,5 +1,5 @@
1	1	#!/usr/bin/python3
2		- version = __version__ = "4.40.0 Released 26-Apr-2021"
	2	+ version = __version__ = "4.40.0.1 Unreleased\nFix for scrollable Column showing can be scrolled when the contents are actually smaller"
3	3
4	4	__version__ = version.split()[0] # For PEP 396 and PEP 345
5	5
@@ -6283,6 +6283,8 @@ def resize_frame(self, e):
6283	6283	self.canvas.itemconfig(self.frame_id, height=e.height, width=e.width)
6284	6284
6285	6285	def yscroll(self, event):
	6286	+ if self.canvas.yview() == (0.0, 1.0):
	6287	+ return
6286	6288	if event.num == 5 or event.delta < 0:
6287	6289	self.canvas.yview_scroll(1, "unit")
6288	6290	elif event.num == 4 or event.delta > 0:

0 commit comments

Comments

0 (0)