changeset 10b24748d6c3 in joypy/Joypy details: http://hg.osdn.jp/view/joypy/Joypy?cmd=changeset;node=10b24748d6c3 user: Simon Forman <sform****@hushm*****> date: Sat May 09 17:31:40 2020 -0700 description: With i3 use separate windows again. diffstat: joy/gui/main.py | 15 +++++++++++---- joy/gui/textwidget.py | 14 ++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diffs (74 lines): diff -r 7a05bcb88df5 -r 10b24748d6c3 joy/gui/main.py --- a/joy/gui/main.py Wed Apr 29 07:46:32 2020 -0700 +++ b/joy/gui/main.py Sat May 09 17:31:40 2020 -0700 @@ -46,7 +46,7 @@ # Now that logging is set up, continue loading the system. -from joy.gui.textwidget import TextViewerWidget, tk, get_font, make_main_window +from joy.gui.textwidget import TextViewerWidget, tk, get_font from joy.gui.world import StackDisplayWorld from joy.library import initialize, DefinitionWrapper from joy.utils.stack import stack_to_string @@ -116,8 +116,8 @@ def show_log(*args): - # log_window.wm_deiconify() - # log_window.update() + log_window.wm_deiconify() + log_window.update() return args @@ -144,7 +144,14 @@ world = StackDisplayWorld(repo, STACK_FN, REL_STACK_FN, dictionary=D) -top, t, log = make_main_window(world) +t = TextViewerWidget(world, **VIEWER_DEFAULTS) + +log_window = tk.Toplevel() +# Make it so that you can't actually close the log window, if you try it +# will just "withdraw" (which is like minifying but without a entry in +# the taskbar or icon or whatever.) +log_window.protocol("WM_DELETE_WINDOW", log_window.withdraw) +log = TextViewerWidget(world, log_window, **VIEWER_DEFAULTS) FONT = get_font('Iosevka', size=14) # Requires Tk root already set up. diff -r 7a05bcb88df5 -r 10b24748d6c3 joy/gui/textwidget.py --- a/joy/gui/textwidget.py Wed Apr 29 07:46:32 2020 -0700 +++ b/joy/gui/textwidget.py Sat May 09 17:31:40 2020 -0700 @@ -426,6 +426,7 @@ return 'break' def init(self, title, filename, repo_relative_filename, repo, font): + self.set_window_title(title) if os.path.exists(filename): with open(filename) as f: data = f.read() @@ -433,6 +434,7 @@ # Prevent this from triggering a git commit. self.update() self._cancelSave() + self.pack(expand=True, fill=tk.BOTH) self.filename = filename self.repo_relative_filename = repo_relative_filename self.repo = repo @@ -470,15 +472,3 @@ T.pack(expand=1, fill=tk.BOTH) T.see(tk.END) - - -def make_main_window(world): - m = tk.PanedWindow(orient=tk.HORIZONTAL) - m.winfo_toplevel().title('Thun') - m.pack(fill=tk.BOTH, expand=True) - H = 45 - t = TextViewerWidget(world, m, width=128, height=H) - log = TextViewerWidget(world, m, width=73, height=H) - m.add(log) - m.add(t) - return m, t, log
Fork