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

Added text justification setting to FlexForm

This commit is contained in:
MikeTheWatchGuy 2018-08-21 18:29:32 -04:00
parent 1d61773df6
commit a4461313ae
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
PySimpleGUI.py
View File

@ -452,7 +452,7 @@ class Text(Element):
''' '''
self.DisplayText = text self.DisplayText = text
self.TextColor = text_color if text_color else DEFAULT_TEXT_COLOR self.TextColor = text_color if text_color else DEFAULT_TEXT_COLOR
self.Justification = justification if justification else DEFAULT_TEXT_JUSTIFICATION self.Justification = justification
if background_color is None: if background_color is None:
bg = DEFAULT_TEXT_ELEMENT_BACKGROUND_COLOR bg = DEFAULT_TEXT_ELEMENT_BACKGROUND_COLOR
else: else:
@ -867,7 +867,7 @@ class FlexForm:
''' '''
Display a user defined for and return the filled in data Display a user defined for and return the filled in data
''' '''
def __init__(self, title, default_element_size=(DEFAULT_ELEMENT_SIZE[0], DEFAULT_ELEMENT_SIZE[1]), auto_size_text=None, auto_size_buttons=None, scale=(None, None), location=(None, None), button_color=None, font=None, progress_bar_color=(None, None), background_color=None, is_tabbed_form=False, border_depth=None, auto_close=False, auto_close_duration=DEFAULT_AUTOCLOSE_TIME, icon=DEFAULT_WINDOW_ICON, return_keyboard_events=False, use_default_focus=True): def __init__(self, title, default_element_size=(DEFAULT_ELEMENT_SIZE[0], DEFAULT_ELEMENT_SIZE[1]), auto_size_text=None, auto_size_buttons=None, scale=(None, None), location=(None, None), button_color=None, font=None, progress_bar_color=(None, None), background_color=None, is_tabbed_form=False, border_depth=None, auto_close=False, auto_close_duration=DEFAULT_AUTOCLOSE_TIME, icon=DEFAULT_WINDOW_ICON, return_keyboard_events=False, use_default_focus=True, text_justification=None):
self.AutoSizeText = auto_size_text if auto_size_text is not None else DEFAULT_AUTOSIZE_TEXT self.AutoSizeText = auto_size_text if auto_size_text is not None else DEFAULT_AUTOSIZE_TEXT
self.AutoSizeButtons = auto_size_buttons if auto_size_buttons is not None else DEFAULT_AUTOSIZE_BUTTONS self.AutoSizeButtons = auto_size_buttons if auto_size_buttons is not None else DEFAULT_AUTOSIZE_BUTTONS
self.Title = title self.Title = title
@ -903,6 +903,7 @@ class FlexForm:
self.UseDefaultFocus = use_default_focus self.UseDefaultFocus = use_default_focus
self.ReturnKeyboardEvents = return_keyboard_events self.ReturnKeyboardEvents = return_keyboard_events
self.LastKeyboardEvent = None self.LastKeyboardEvent = None
self.TextJustification = text_justification
# ------------------------- Add ONE Row to Form ------------------------- # # ------------------------- Add ONE Row to Form ------------------------- #
def AddRow(self, *args): def AddRow(self, *args):
@ -1040,17 +1041,15 @@ class FlexForm:
else: else:
self.LastKeyboardEvent = str(event.keysym) + ':' + str(event.keycode) self.LastKeyboardEvent = str(event.keysym) + ':' + str(event.keycode)
if not self.NonBlocking: if not self.NonBlocking:
results = BuildResults(self, False, self) BuildResults(self, False, self)
self.TKroot.quit() self.TKroot.quit()
def MouseWheelCallback(self, event ): def MouseWheelCallback(self, event ):
self.LastButtonClicked = None self.LastButtonClicked = None
self.FormRemainedOpen = True self.FormRemainedOpen = True
# print(ObjToStringSingleObj(event)) self.LastKeyboardEvent = 'MouseWheel:' + 'Down' if event.delta < 0 else 'Up'
direction = 'Down' if event.delta < 0 else 'Up'
self.LastKeyboardEvent = 'MouseWheel:' + direction
if not self.NonBlocking: if not self.NonBlocking:
results = BuildResults(self, False, self) BuildResults(self, False, self)
self.TKroot.quit() self.TKroot.quit()
@ -1059,7 +1058,7 @@ class FlexForm:
self.TKroot.update() self.TKroot.update()
except: pass except: pass
if not self.NonBlocking: if not self.NonBlocking:
results = BuildResults(self, False, self) BuildResults(self, False, self)
if self.TKrootDestroyed: if self.TKrootDestroyed:
return None return None
self.TKrootDestroyed = True self.TKrootDestroyed = True
@ -1424,8 +1423,14 @@ def PackFormIntoFrame(form, containing_frame, toplevel_form):
stringvar.set(display_text) stringvar.set(display_text)
if auto_size_text: if auto_size_text:
width = 0 width = 0
justify = tk.LEFT if element.Justification == 'left' else tk.CENTER if element.Justification == 'center' else tk.RIGHT if element.Justification is not None:
anchor = tk.NW if element.Justification == 'left' else tk.N if element.Justification == 'center' else tk.NE justification = element.Justification
elif toplevel_form.TextJustification is not None:
justification = toplevel_form.TextJustification
else:
justification = DEFAULT_TEXT_JUSTIFICATION
justify = tk.LEFT if justification == 'left' else tk.CENTER if justification == 'center' else tk.RIGHT
anchor = tk.NW if justification == 'left' else tk.N if justification == 'center' else tk.NE
tktext_label = tk.Label(tk_row_frame, textvariable=stringvar, width=width, height=height, justify=justify, bd=border_depth) tktext_label = tk.Label(tk_row_frame, textvariable=stringvar, width=width, height=height, justify=justify, bd=border_depth)
# tktext_label = tk.Label(tk_row_frame,anchor=tk.NW, text=display_text, width=width, height=height, justify=tk.LEFT, bd=border_depth) # tktext_label = tk.Label(tk_row_frame,anchor=tk.NW, text=display_text, width=width, height=height, justify=tk.LEFT, bd=border_depth)
# Set wrap-length for text (in PIXELS) == PAIN IN THE ASS # Set wrap-length for text (in PIXELS) == PAIN IN THE ASS