Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[UX] DPI: show concrete numbers and add more custom DPI presets #4389

Merged
merged 1 commit into from
Dec 8, 2018
Merged

[UX] DPI: show concrete numbers and add more custom DPI presets #4389

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 46 additions & 11 deletions frontend/ui/elements/screen_dpi_menu_table.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,53 +11,88 @@ local function setDPI(_dpi)
local InfoMessage = require("ui/widget/infomessage")
local UIManager = require("ui/uimanager")
UIManager:show(InfoMessage:new{
text = _("This will take effect after restarting."),
text = T(_("DPI set to %1. This will take effect after restarting."), _dpi),
})
G_reader_settings:saveSetting("screen_dpi", _dpi)
Screen:setDPI(_dpi)
end

local dpi_auto = Screen:getDPI()
local dpi_small = 120
local dpi_medium = 160
local dpi_large = 240
local dpi_xlarge = 320
local dpi_xxlarge = 480
local dpi_xxxlarge = 640

return {
text = _("Screen DPI"),
sub_item_table = {
{
text = _("Auto"),
text = T(_("Auto DPI (%1)"), dpi_auto),
help_text = _("The DPI of your screen is automatically detected so items can be drawn with the right amount of pixels. This will usually display at (roughly) the same size on different devices, while remaining sharp. Increasing the DPI setting will result in larger text and icons, while a lower DPI setting will look smaller on the screen."),
checked_func = function()
return dpi() == nil
end,
callback = function() setDPI() end
},
{
text = _("Small"),
text = T(_("Small (%1)"), dpi_small),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi <= 140 and _dpi ~= _custom
end,
callback = function() setDPI(120) end
callback = function() setDPI(dpi_small) end
},
{
text = _("Medium"),
text = T(_("Medium (%1)"), dpi_medium),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi > 140 and _dpi <= 200 and _dpi ~= _custom
end,
callback = function() setDPI(160) end
callback = function() setDPI(dpi_medium) end
},
{
text = _("Large"),
text = T(_("Large (%1)"), dpi_large),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi > 200 and _dpi ~= _custom
return _dpi and _dpi > 200 and _dpi <= 280 and _dpi ~= _custom
end,
callback = function() setDPI(240) end
callback = function() setDPI(dpi_large) end
},
{
text = T(_("Custom DPI: %1 (hold to set)"), custom() or 160),
text = T(_("Extra large (%1)"), dpi_xlarge),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi > 280 and _dpi <= 400 and _dpi ~= _custom
end,
callback = function() setDPI(dpi_xlarge) end
},
{
text = T(_("Extra-Extra Large (%1)"), dpi_xxlarge),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi > 400 and _dpi <= 560 and _dpi ~= _custom
end,
callback = function() setDPI(dpi_xxlarge) end
},
{
text = T(_("Extra-Extra-Extra Large (%1)"), dpi_xxxlarge),
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _dpi and _dpi > 560 and _dpi ~= _custom
end,
callback = function() setDPI(dpi_xxxlarge) end
},
{
text_func = function()
return T(_("Custom DPI: %1 (hold to set)"), custom() or dpi_auto)
end,
checked_func = function()
local _dpi, _custom = dpi(), custom()
return _custom and _dpi == _custom
end,
callback = function() setDPI(custom() or 160) end,
callback = function() setDPI(custom() or dpi_auto) end,
hold_input = {
title = _("Enter custom screen DPI"),
type = "number",
Expand Down