update gui/overlay for scaled interface behavior

Author: myk002

gui/overlay.lua

@@ -54,15 +54,12 @@ DraggablePanel.ATTRS{
     draggable=true,
     drag_anchors={frame=true, body=true},
     drag_bound='body',
+    widget=DEFAULT_NIL,
 }
 
 function DraggablePanel:onInput(keys)
-    if keys._MOUSE_L then
-        local rect = self.frame_rect
-        local x,y = self:getMousePos(gui.ViewRect{rect=rect})
-        if x then
-            self.on_click()
-        end
+    if keys._MOUSE_L and self:getMousePos() then
+        self.on_click()
     end
     return DraggablePanel.super.onInput(self, keys)
 end
@@ -72,16 +69,16 @@ function DraggablePanel:postUpdateLayout()
     local frame = self.frame
     local matcher = {t=not not frame.t, b=not not frame.b,
                      l=not not frame.l, r=not not frame.r}
-    local parent_rect, frame_rect = self.frame_parent_rect, self.frame_rect
-    if frame_rect.y1 <= parent_rect.y1 then
-        frame.t, frame.b = frame_rect.y1-parent_rect.y1, nil
-    elseif frame_rect.y2 >= parent_rect.y2 then
-        frame.t, frame.b = nil, parent_rect.y2-frame_rect.y2
+    local parent_rect, frame_rect = self.widget.frame_parent_rect, self.frame_body
+    if frame_rect.y1-1 <= parent_rect.y1 then
+        frame.t, frame.b = frame_rect.y1-parent_rect.y1-1, nil
+    elseif frame_rect.y2+1 >= parent_rect.y2 then
+        frame.t, frame.b = nil, parent_rect.y2-frame_rect.y2-1
     end
-    if frame_rect.x1 <= parent_rect.x1 then
-        frame.l, frame.r = frame_rect.x1-parent_rect.x1, nil
-    elseif frame_rect.x2 >= parent_rect.x2 then
-        frame.l, frame.r = nil, parent_rect.x2-frame_rect.x2
+    if frame_rect.x1-1 <= parent_rect.x1 then
+        frame.l, frame.r = frame_rect.x1-parent_rect.x1-1, nil
+    elseif frame_rect.x2+1 >= parent_rect.x2 then
+        frame.l, frame.r = nil, parent_rect.x2-frame_rect.x2-1
     end
     self.frame_style = make_highlight_frame_style(self.frame)
     if not not frame.t ~= matcher.t or not not frame.b ~= matcher.b
@@ -92,7 +89,7 @@ function DraggablePanel:postUpdateLayout()
 end
 
 function DraggablePanel:onRenderFrame(dc, rect)
-    if self:getMousePos(gui.ViewRect{rect=self.frame_rect}) then
+    if self:getMousePos() then
         self.frame_background = to_pen{
                 ch=32, fg=COLOR_LIGHTGREEN, bg=COLOR_LIGHTGREEN}
     else
@@ -112,6 +109,7 @@ function OverlayConfig:init()
     overlay.register_trigger_lock_screen(self)
 
     local contexts = dfhack.gui.getFocusStrings(dfhack.gui.getDFViewscreen(true))
+    local interface_width_pct = df.global.init.display.max_interface_percentage
 
     local main_panel = widgets.Window{
         frame={w=DIALOG_WIDTH, h=LIST_HEIGHT+15},
@@ -124,19 +122,25 @@ function OverlayConfig:init()
             frame={t=0, l=0},
             text={
                 'Current contexts: ',
-                {text=table.concat(contexts, ', '), pen=COLOR_CYAN}
+                {text=table.concat(contexts, ', '), pen=COLOR_CYAN},
+            }},
+        widgets.Label{
+            frame={t=2, l=0},
+            text={
+                'Interface width percent: ',
+                {text=interface_width_pct, pen=COLOR_CYAN},
             }},
         widgets.CycleHotkeyLabel{
             view_id='filter',
-            frame={t=2, l=0},
+            frame={t=4, l=0},
             key='CUSTOM_CTRL_O',
-            label='Showing:',
+            label='Showing',
             options={{label='overlays for the current contexts', value='cur'},
                      {label='all overlays', value='all'}},
             on_change=self:callback('refresh_list')},
         widgets.FilteredList{
             view_id='list',
-            frame={t=4, b=7},
+            frame={t=6, b=7},
             on_select=self:callback('highlight_selected'),
         },
         widgets.HotkeyLabel{
@@ -160,7 +164,21 @@ function OverlayConfig:init()
                 ' to anchor the widget to that edge.',
         },
     }
-    self:addviews{main_panel}
+
+    self:addviews{
+        widgets.Divider{
+            view_id='left_border',
+            frame={l=0, w=1},
+            frame_style=gui.FRAME_THIN,
+        },
+        widgets.Divider{
+            view_id='right_border',
+            frame={r=0, w=1},
+            frame_style=gui.FRAME_THIN,
+        },
+        main_panel,
+    }
+
     self:refresh_list()
 end
 
@@ -203,15 +221,18 @@ function OverlayConfig:refresh_list(filter)
             frame_style=SHADOW_FRAME,
             on_click=make_on_click_fn(#choices+1),
             name=name,
+            widget=widget,
         }
         panel.on_drag_end = function(success)
             if (success) then
                 local frame = panel.frame
-                local posx = frame.l and tostring(frame.l+2)
-                        or tostring(-(frame.r+2))
-                local posy = frame.t and tostring(frame.t+2)
-                        or tostring(-(frame.b+2))
-                overlay.overlay_command({'position', name, posx, posy},true)
+                local frame_rect = panel.frame_rect
+                local frame_parent_rect = panel.frame_parent_rect
+                local posx = frame.l and tostring(frame_rect.x1+2)
+                        or tostring(frame_rect.x2-frame_parent_rect.width-1)
+                local posy = frame.t and tostring(frame_rect.y1+2)
+                        or tostring(frame_rect.y2-frame_parent_rect.height-1)
+                overlay.overlay_command({'position', name, posx, posy}, true)
             end
             self.reposition_panel = nil
         end
@@ -267,15 +288,27 @@ function OverlayConfig:reset()
     if not obj or not obj.panel then return end
     overlay.overlay_command({'position', obj.panel.name, 'default'}, true)
     self:refresh_list(self.subviews.filter:getOptionValue())
+    self:updateLayout()
 end
 
 function OverlayConfig:onDismiss()
     view = nil
 end
 
+function OverlayConfig:preUpdateLayout(parent_rect)
+    local interface_rect = gui.get_interface_rect()
+    local left, right = self.subviews.left_border, self.subviews.right_border
+    left.frame.l = interface_rect.x1 - 1
+    left.visible = left.frame.l >= 0
+    right.frame.r = nil
+    right.frame.l = interface_rect.x2 + 1
+    right.visible = right.frame.l < parent_rect.width
+end
+
 function OverlayConfig:postUpdateLayout()
+    local rect = gui.ViewRect{rect=gui.get_interface_rect()}
     for _,choice in ipairs(self.subviews.list:getChoices()) do
-        choice.panel:updateLayout(choice.widget.frame_parent_rect)
+        choice.panel:updateLayout(rect)
     end
 end
 
@@ -304,17 +337,18 @@ function OverlayConfig:onInput(keys)
     end
 end
 
-function OverlayConfig:onRenderFrame(dc, rect)
+function OverlayConfig:onRenderFrame()
     self:renderParent()
+    local interface_area_painter = gui.Painter.new(gui.ViewRect{rect=gui.get_interface_rect()})
     for _,choice in ipairs(self.subviews.list:getVisibleChoices()) do
         local panel = choice.panel
         if panel and panel ~= self.selected_panel then
-            panel:render(dc)
+            panel:render(interface_area_painter)
         end
     end
     if self.selected_panel then
         self.render_selected_panel = function()
-            self.selected_panel:render(dc)
+            self.selected_panel:render(interface_area_painter)
         end
     else
         self.render_selected_panel = nil