renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

optionsutil: Simplify the public formatFlexSize wrapper

Browse Source 
Pull the dimension_units from in there,
instead of asking callers to do that.
This commit is contained in:
NiLuJe
2024-09-13 13:50:31 +02:00
parent 3cbd75b385
commit e887be693f
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/apps/reader/modules/readertypeset.lua
View File

@@ -514,10 +514,10 @@ Margins set to:
footer: %5 px
Tap to dismiss.]]),
optionsutil.formatFlexSize(margins[1], G_reader_settings:readSetting("dimension_units")),
optionsutil.formatFlexSize(margins[2], G_reader_settings:readSetting("dimension_units")),
optionsutil.formatFlexSize(margins[3], G_reader_settings:readSetting("dimension_units")),
optionsutil.formatFlexSize(margins[4], G_reader_settings:readSetting("dimension_units")),
optionsutil.formatFlexSize(margins[1]),
optionsutil.formatFlexSize(margins[2]),
optionsutil.formatFlexSize(margins[3]),
optionsutil.formatFlexSize(margins[4]),
self.view.footer.reclaim_height and 0 or self.view.footer:getHeight()),
dismiss_callback = when_applied_callback,
})

2
frontend/apps/reader/modules/readerview.lua
View File

@@ -1094,7 +1094,7 @@ end
function ReaderView:onPageGapUpdate(page_gap)
self.page_gap.height = Screen:scaleBySize(page_gap)
Notification:notify(T(_("Page gap set to %1."), optionsutil.formatFlexSize(page_gap, G_reader_settings:readSetting("dimension_units"))))
Notification:notify(T(_("Page gap set to %1."), optionsutil.formatFlexSize(page_gap)))
return true
end

34
frontend/ui/data/optionsutil.lua
View File

@@ -40,7 +40,7 @@ local function convertSizeTo(px, format)
return Screen:scaleBySize(px) / display_dpi * format_factor
end
function optionsutil.formatFlexSize(value, unit)
local function formatFlexSize(value, unit)
if not value then
-- This shouldn't really ever happen...
return ""
@@ -77,6 +77,12 @@ function optionsutil.formatFlexSize(value, unit)
end
end
-- Public wrapper for callers outside of ConfigOption, where we can't pull name_text_unit from option
function optionsutil.formatFlexSize(value, unit)
unit = unit or G_reader_settings:readSetting("dimension_units", "mm")
return formatFlexSize(value, unit)
end
function optionsutil.showValues(configurable, option, prefix, document, unit)
local default = G_reader_settings:readSetting(prefix.."_"..option.name)
local current = configurable[option.name]
@@ -166,21 +172,21 @@ function optionsutil.showValues(configurable, option, prefix, document, unit)
local nb_current, nb_default = tonumber(current), tonumber(default)
if nb_current == nil or nb_default == nil then
text = T(_("%1\n%2\nCurrent value: %3\nDefault value: %4"), name_text, help_text,
optionsutil.formatFlexSize(value_current or current, unit),
optionsutil.formatFlexSize(value_default or default, unit))
formatFlexSize(value_current or current, unit),
formatFlexSize(value_default or default, unit))
elseif value_default then
text = T(_("%1\n%2\nCurrent value: %3 (%4)\nDefault value: %5 (%6)"), name_text, help_text,
current, optionsutil.formatFlexSize(value_current, unit),
default, optionsutil.formatFlexSize(value_default, unit))
current, formatFlexSize(value_current, unit),
default, formatFlexSize(value_default, unit))
else
text = T(_("%1\n%2\nCurrent value: %3 (%4)\nDefault value: %5"), name_text, help_text,
current, optionsutil.formatFlexSize(value_current, unit),
current, formatFlexSize(value_current, unit),
default)
end
else
text = T(_("%1\n%2\nCurrent value: %3\nDefault value: %4"), name_text, help_text,
optionsutil.formatFlexSize(current, unit),
optionsutil.formatFlexSize(default, unit))
formatFlexSize(current, unit),
formatFlexSize(default, unit))
end
UIManager:show(InfoMessage:new{ text=text })
end
@@ -196,8 +202,8 @@ Current margins:
left: %1
right: %2
Default margins: not set]]),
optionsutil.formatFlexSize(current[1], unit),
optionsutil.formatFlexSize(current[2], unit))
formatFlexSize(current[1], unit),
formatFlexSize(current[2], unit))
})
else
UIManager:show(InfoMessage:new{
@@ -208,10 +214,10 @@ Current margins:
Default margins:
left: %3
right: %4]]),
optionsutil.formatFlexSize(current[1], unit),
optionsutil.formatFlexSize(current[2], unit),
optionsutil.formatFlexSize(default[1], unit),
optionsutil.formatFlexSize(default[2], unit))
formatFlexSize(current[1], unit),
formatFlexSize(current[2], unit),
formatFlexSize(default[1], unit),
formatFlexSize(default[2], unit))
})
end
end