hide advanced widgets for now (revert later)

DFHack · Aug 30, 2023 · 56538fb · 56538fb
1 parent f38d52f
commit 56538fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/internal/caravan/common.lua b/internal/caravan/common.lua
@@ -182,7 +182,7 @@ function get_slider_widgets(self, suffix)
             },
         },
         widgets.Panel{
-            frame={t=6, l=0, r=0, h=4},
+            frame={t=5, l=0, r=0, h=4},
             subviews={
                 widgets.CycleHotkeyLabel{
                     view_id='min_quality'..suffix,
@@ -247,7 +247,7 @@ function get_slider_widgets(self, suffix)
             },
         },
         widgets.Panel{
-            frame={t=12, l=0, r=0, h=4},
+            frame={t=10, l=0, r=0, h=4},
             subviews={
                 widgets.CycleHotkeyLabel{
                     view_id='min_value'..suffix,
@@ -463,6 +463,7 @@ function get_advanced_filter_widgets(self, context)
     local predicate_str = predicates.make_predicate_str(context)
 
     return {
+        --[[
         widgets.Label{
             frame={t=0, l=0},
             text='Advanced filter:',
@@ -496,6 +497,7 @@ function get_advanced_filter_widgets(self, context)
             text={{text=function() return predicate_str end}},
             text_pen=COLOR_GREEN,
         },
+        --]]
     }
 end
 

diff --git a/internal/caravan/movegoods.lua b/internal/caravan/movegoods.lua
@@ -161,7 +161,7 @@ function MoveGoods:init()
             on_char=function(ch) return ch:match('[%l -]') end,
         },
         widgets.Panel{
-            frame={t=2, l=0, w=38, h=16},
+            frame={t=2, l=0, w=38, h=14},
             subviews=common.get_slider_widgets(self),
         },
         widgets.ToggleHotkeyLabel{
@@ -177,11 +177,11 @@ function MoveGoods:init()
             on_change=function() self:refresh_list() end,
         },
         widgets.Panel{
-            frame={t=4, l=40, r=0, h=15},
+            frame={t=4, l=40, r=0, h=12},
             subviews=common.get_info_widgets(self, get_export_agreements(), self.predicate_context),
         },
         widgets.Panel{
-            frame={t=19, l=0, r=0, b=6},
+            frame={t=17, l=0, r=0, b=6},
             subviews={
                 widgets.CycleHotkeyLabel{
                     view_id='sort_status',

diff --git a/internal/caravan/trade.lua b/internal/caravan/trade.lua
@@ -139,7 +139,7 @@ end
 
 local STATUS_COL_WIDTH = 7
 local VALUE_COL_WIDTH = 6
-local FILTER_HEIGHT = 17
+local FILTER_HEIGHT = 15
 
 function Trade:init()
     self.cur_page = 1