colin/uosc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dimensions only when necessary

Browse Source
This commit is contained in:
Christoph Heinrich
2022-08-17 04:09:03 +02:00
committed by Tomas Klaen
parent 52aa396087
commit a003928611
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
uosc.lua
View File

@@ -1020,6 +1020,7 @@ function Menu:open(items, open_item, opts)
end
-- Set initial dimensions
this:update_dimensions()
this:on_display_change()
-- Scroll to selected item
@@ -1041,7 +1042,7 @@ function Menu:open(items, open_item, opts)
destroy = function(this)
request_render()
end,
on_display_change = function(this)
update_dimensions = function(this)
this.item_height = state.fullormaxed and options.menu_item_height_fullscreen or options.menu_item_height
this.font_size = round(this.item_height * 0.48 * options.menu_font_scale)
this.font_size_hint = this.font_size - 1
@@ -1075,14 +1076,21 @@ function Menu:open(items, open_item, opts)
local max_height = round(display.height * 0.9) - title_height
this.height = math.min(round(this.scroll_step * #this.items) - this.item_spacing, max_height)
this.scroll_height = math.max((this.scroll_step * #this.items) - this.height - this.item_spacing, 0)
-- Update offsets for new sizes
this:set_offset_x(this.offset_x)
if this.parent_menu then
this.parent_menu:update_dimensions()
end
end,
on_display_change = function(this)
local title_height = this.title and this.scroll_step or 0
this.ax = round((display.width - this.width) / 2) + this.offset_x
this.ay = round((display.height - this.height) / 2 + (title_height / 2))
this.bx = round(this.ax + this.width)
this.by = round(this.ay + this.height)
-- Update offsets for new sizes
this:set_offset_x(this.offset_x)
if this.parent_menu then
this.parent_menu:on_display_change()
end
@@ -1093,6 +1101,7 @@ function Menu:open(items, open_item, opts)
end
-- Trigger changes and re-render
this:update_dimensions()
this:on_display_change()
-- Reset indexes and scroll
@@ -1167,6 +1176,7 @@ function Menu:open(items, open_item, opts)
if (index and index >= 1 and index <= #this.items) then
local previous_active_value = this.active_index and this.items[this.active_index].value or nil
table.remove(this.items, index)
this:update_dimensions()
this:on_display_change()
if previous_active_value then this:activate_value(previous_active_value) end
this:scroll_to_item(this.selected_item)
@@ -1247,6 +1257,7 @@ function Menu:open(items, open_item, opts)
end,
open_selected_item_soft = function(this) this:open_selected_item(true) end,
close = function(this) menu:close() end,
on_prop_fullormaxed = function(this) this:update_dimensions() end,
on_global_mbtn_left_down = function(this)
if this.proximity_raw == 0 then
this.selected_item = this:get_item_index_below_cursor()