mirror of
https://github.com/koreader/koreader
synced 2024-11-16 06:12:56 +00:00
525b1957b9
* Menu/KeyValuePage/ReaderGoTo: Unify the dialogs. (Generally, "Enter page number" as title, and "Go to page" as OK button). * Allow *tapping* on pagination buttons, too. Added spacers around the text to accommodate for that. * Disable input handlers when <= 1 pages, while still printing the label in black. * Always display both the label and the chevrons, even on single page content. (Menu being an exception, because it can handle showing no content at all, in which case we hide the chevrons). * KVP: Tweak the pagination buttons layout in order to have consistent centering, regardless of whether the return arrow is enabled or not. (Also, match Menu's layout, more or less). * Menu: Minor layout tweaks to follow the KVP tweaks above. Fixes, among possibly other things, buttons in (non-FM) "List" menus overlapping the final entry (e.g., OPDS), and popout menus with a border being misaligned (e.g., Calibre, Find a file). * CalendarView: Minor layout tweaks to follow the KVP tweaks. Ensures the pagination buttons are laid out in the same way as everywhere else (they used to be a wee bit higher).
104 lines
3.3 KiB
Lua
104 lines
3.3 KiB
Lua
--[[--
|
|
This module provides a standardized set of sizes for use in widgets.
|
|
|
|
There are values for borders, margins, paddings, radii, and lines. Have a look
|
|
at the code for full details. If you are considering to deviate from one of the
|
|
defaults, please take a second to consider:
|
|
|
|
1. Why you want to differ in the first place. We consciously strive toward
|
|
consistency in the UI, which is typically valued higher than one pixel more
|
|
or less in a specific context.
|
|
2. If there really isn't anything close to what you want, whether it should be
|
|
added to the arsenal of default sizes rather than as a local exception.
|
|
|
|
@usage
|
|
local Size = require("ui/size")
|
|
local frame -- just an example widget
|
|
frame = FrameContainer:new{
|
|
radius = Size.radius.window,
|
|
bordersize = Size.border.window,
|
|
padding = Size.padding.default,
|
|
margin = Size.margin.default,
|
|
VerticalGroup:new{
|
|
-- etc
|
|
}
|
|
}
|
|
]]
|
|
|
|
local dbg = require("dbg")
|
|
local Screen = require("device").screen
|
|
|
|
local Size = {
|
|
border = {
|
|
default = Screen:scaleBySize(1),
|
|
thin = Screen:scaleBySize(0.5),
|
|
button = Screen:scaleBySize(1.5),
|
|
window = Screen:scaleBySize(1.5),
|
|
thick = Screen:scaleBySize(2),
|
|
inputtext = Screen:scaleBySize(2),
|
|
},
|
|
margin = {
|
|
default = Screen:scaleBySize(5),
|
|
tiny = Screen:scaleBySize(1),
|
|
small = Screen:scaleBySize(2),
|
|
title = Screen:scaleBySize(2),
|
|
fine_tune = Screen:scaleBySize(3),
|
|
fullscreen_popout = Screen:scaleBySize(3), -- Size.border.window * 2
|
|
button = 0,
|
|
},
|
|
padding = {
|
|
default = Screen:scaleBySize(5),
|
|
tiny = Screen:scaleBySize(1),
|
|
small = Screen:scaleBySize(2),
|
|
large = Screen:scaleBySize(10),
|
|
button = Screen:scaleBySize(2),
|
|
buttontable = Screen:scaleBySize(4),
|
|
fullscreen = Screen:scaleBySize(15),
|
|
},
|
|
radius = {
|
|
default = Screen:scaleBySize(2),
|
|
window = Screen:scaleBySize(7),
|
|
button = Screen:scaleBySize(7),
|
|
},
|
|
line = {
|
|
thin = Screen:scaleBySize(0.5),
|
|
medium = Screen:scaleBySize(1),
|
|
thick = Screen:scaleBySize(1.5),
|
|
progress = Screen:scaleBySize(7),
|
|
},
|
|
item = {
|
|
height_default = Screen:scaleBySize(30),
|
|
height_big = Screen:scaleBySize(40),
|
|
height_large = Screen:scaleBySize(50),
|
|
},
|
|
span = {
|
|
horizontal_default = Screen:scaleBySize(10),
|
|
horizontal_small = Screen:scaleBySize(5),
|
|
vertical_default = Screen:scaleBySize(2),
|
|
vertical_large = Screen:scaleBySize(5),
|
|
},
|
|
}
|
|
|
|
if dbg.is_on then
|
|
local mt = {
|
|
__index = function(t, k)
|
|
local prop_value = rawget(t, k)
|
|
local prop_exists = prop_value ~= nil
|
|
if not prop_exists then
|
|
local warning = rawget(t, "_name") and string.format("Size.%s.%s", rawget(t, "_name"), k)
|
|
or string.format("Size.%s", k)
|
|
error("Size: this property does not exist: " .. warning)
|
|
end
|
|
assert(prop_exists)
|
|
return prop_value
|
|
end
|
|
}
|
|
setmetatable(Size, mt)
|
|
for el, table in pairs(Size) do
|
|
table._name = el
|
|
setmetatable(Size[el], mt)
|
|
end
|
|
end
|
|
|
|
return Size
|