MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix scrollbar display when all text is visible 

also align behavior with documentation when 'left' or 'right' is
explicitly specified (i.e. always show the scrollbar)
develop
myk002 2022-09-11 18:56:43 -07:00
parent bcf1b5ddac
commit e2fbade219
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/lua/gui/widgets.lua
Unescape Escape View File

@ -599,8 +599,8 @@ local function get_scrollbar_pos_and_height(label)
local scrollbar_body_height = label.frame_body.height - 2
local displayed_lines = last_visible_line - first_visible_line
local height = math.min(scrollbar_body_height - 1,
math.ceil((displayed_lines-1) * scrollbar_body_height / text_height))
local height = math.floor(((displayed_lines-1) * scrollbar_body_height) /
text_height)
local max_pos = scrollbar_body_height - height
local pos = math.ceil(((first_visible_line-1) * max_pos) /
@ -683,7 +683,6 @@ end
function Label:onRenderFrame(dc, rect)
if self._show_scrollbar
and self:getTextHeight() > self.frame_body.height
then
local x = self._show_scrollbar == 'left'
and self.frame_body.x1-dc.x1-1