Fix journal issue with resize frame

DFHack · Aug 1, 2024 · cec0dc5 · cec0dc5
1 parent e7001f4
commit cec0dc5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/gui/journal.lua b/gui/journal.lua
@@ -13,11 +13,6 @@ local RESIZE_MIN = {w=32, h=10}
 
 JOURNAL_PERSIST_KEY = 'journal'
 
-local INVISIBLE_FRAME = {
-    frame_pen=gui.CLEAR_PEN,
-    signature_pen=false,
-}
-
 journal_config = journal_config or json.open('dfhack-config/journal.json')
 
 JournalWindow = defclass(JournalWindow, widgets.Window)
@@ -88,7 +83,6 @@ function JournalWindow:init()
 
             interior_b=true,
             frame_style_t=false,
-            frmae_style=INVISIBLE_FRAME,
         },
         text_editor.TextEditor{
             view_id='journal_editor',
@@ -227,11 +221,11 @@ function JournalWindow:ensurePanelsRelSize()
     local divider = self.subviews.table_of_contents_divider
 
     toc_panel.frame.w = math.min(
-        math.max(toc_panel.frame.w, toc_panel.resize_min.w),
-        self.frame.w - editor.resize_min.w
+        math.max(toc_panel.frame_parent_rect.w, toc_panel.resize_min.w),
+        self.frame_parent_rect.w - editor.resize_min.w
     )
-    editor.frame.l = toc_panel.visible and toc_panel.frame.w or 1
-    divider.frame.l = editor.frame.l - 1
+    editor.frame.l = toc_panel.visible and toc_panel.frame_parent_rect.w or 1
+    divider.frame.l = editor.frame_parent_rect.l - 1
 end
 
 function JournalWindow:preUpdateLayout()

diff --git a/internal/journal/table_of_contents.lua b/internal/journal/table_of_contents.lua
@@ -3,6 +3,11 @@
 local gui = require 'gui'
 local widgets = require 'gui.widgets'
 
+local INVISIBLE_FRAME = {
+    frame_pen=gui.CLEAR_PEN,
+    signature_pen=false,
+}
+
 TableOfContents = defclass(TableOfContents, widgets.Panel)
 TableOfContents.ATTRS {
     frame_style=INVISIBLE_FRAME,