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

Merge pull request #4491 from PySimpleGUI/Dev-latest 

Changed Sizegrip to not expand the row that it's on.  Fixed custom ti…
This commit is contained in:
PySimpleGUI 2021-07-03 17:22:37 -04:00 committed by GitHub
parent 624a3c4e8f 93633b4a95
commit 699bc5233d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PySimpleGUI.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3 #!/usr/bin/python3
version = __version__ = "4.45.0.4 Unreleased\nAdded autoscroll parameter to Multiline.print & cprint - defaults to True (backward compatible), ButtonMenu use font for button as menu font if none is supplied, make a copy of menu definition when making ButtonMenu, made menu definition optional for ButtonMenu so can change only some other settings, set class_ for Toplevel windows to fix problem with titles on some Linux systems, fix bug when menu shortcut char in first pos and item is disabled !&Item" version = __version__ = "4.45.0.5 Unreleased\nAdded autoscroll parameter to Multiline.print & cprint - defaults to True (backward compatible), ButtonMenu use font for button as menu font if none is supplied, make a copy of menu definition when making ButtonMenu, made menu definition optional for ButtonMenu so can change only some other settings, set class_ for Toplevel windows to fix problem with titles on some Linux systems, fix bug when menu shortcut char in first pos and item is disabled !&Item, Sizegrip - fixed expansion problem. Should not have expanded row."
__version__ = version.split()[0] # For PEP 396 and PEP 345 __version__ = version.split()[0] # For PEP 396 and PEP 345
@ -1004,6 +1004,7 @@ class Element():
self.ParentForm.normal() self.ParentForm.normal()
def _ReturnKeyHandler(self, event): def _ReturnKeyHandler(self, event):
""" """
Internal callback for the ENTER / RETURN key. Results in calling the ButtonCallBack for element that has the return key bound to it, just as if button was clicked. Internal callback for the ENTER / RETURN key. Results in calling the ButtonCallBack for element that has the return key bound to it, just as if button was clicked.
@ -4497,13 +4498,13 @@ class Image(Element):
if image is not None: if image is not None:
if type(image) is not bytes: if type(image) is not bytes:
width, height = size[0] or image.width(), size[1] or image.height() width, height = size[0] if size[0] is not None else image.width(), size[1] if size[1] is not None else image.height()
else: else:
width, height = size width, height = size
try: # sometimes crashes if user closed with X try: # sometimes crashes if user closed with X
self.tktext_label.configure(image=image, width=width, height=height) self.tktext_label.configure(image=image, width=width, height=height)
except: except Exception as e:
pass _error_popup_with_traceback('Exception updating Image element', e)
self.tktext_label.image = image self.tktext_label.image = image
if visible is False: if visible is False:
self.tktext_label.pack_forget() self.tktext_label.pack_forget()
@ -7979,6 +7980,7 @@ Normally a tuple, but can be a simplified-dual-color-string "foreground on backg
self.right_click_menu_selected_colors = _simplified_dual_color_to_tuple(right_click_menu_selected_colors, (self.right_click_menu_background_color, self.right_click_menu_text_color)) self.right_click_menu_selected_colors = _simplified_dual_color_to_tuple(right_click_menu_selected_colors, (self.right_click_menu_background_color, self.right_click_menu_text_color))
self._grab_anywhere_ignore_these_list = [] self._grab_anywhere_ignore_these_list = []
self._grab_anywhere_include_these_list = [] self._grab_anywhere_include_these_list = []
self._has_custom_titlebar = use_custom_titlebar
if self.use_custom_titlebar: if self.use_custom_titlebar:
self.Margins = (0,0) self.Margins = (0,0)
@ -8173,7 +8175,7 @@ Normally a tuple, but can be a simplified-dual-color-string "foreground on backg
if self._has_custom_titlebar_element(): if self._has_custom_titlebar_element():
self.Margins = (0,0) self.Margins = (0,0)
self.NoTitleBar = True self.NoTitleBar = True
self._has_custom_titlebar = True
return self return self
@ -8312,6 +8314,8 @@ Normally a tuple, but can be a simplified-dual-color-string "foreground on backg
pass pass
self.WindowIcon = wicon self.WindowIcon = wicon
def _GetElementAtLocation(self, location): def _GetElementAtLocation(self, location):
""" """
Given a (row, col) location in a layout, return the element located at that position Given a (row, col) location in a layout, return the element located at that position
@ -9783,12 +9787,14 @@ Normally a tuple, but can be a simplified-dual-color-string "foreground on backg
def _has_custom_titlebar_element(self): def _has_custom_titlebar_element(self):
for elem in self.AllKeysDict.values(): for elem in self.AllKeysDict.values():
if elem.Key in (TITLEBAR_MAXIMIZE_KEY, TITLEBAR_CLOSE_KEY, TITLEBAR_IMAGE_KEY):
return True
if elem.metadata == TITLEBAR_METADATA_MARKER: if elem.metadata == TITLEBAR_METADATA_MARKER:
return True return True
return False return False
AddRow = add_row AddRow = add_row
AddRows = add_rows AddRows = add_rows
AlphaChannel = alpha_channel AlphaChannel = alpha_channel
@ -14019,7 +14025,7 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
style.configure(style_name, background=toplevel_form.TKroot['bg']) style.configure(style_name, background=toplevel_form.TKroot['bg'])
size_grip.configure(style=style_name) size_grip.configure(style=style_name)
size_grip.pack(side=tk.RIGHT, anchor='se', padx=0, pady=0, fill=tk.X, expand=True) size_grip.pack(side=tk.RIGHT, anchor='se', padx=0, pady=0, fill=tk.X, expand=True)
row_should_expand = True # row_should_expand = True
row_fill_direction = tk.BOTH row_fill_direction = tk.BOTH
size_grip = None size_grip = None
# ------------------------- StatusBar placement element ------------------------- # # ------------------------- StatusBar placement element ------------------------- #