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

Merge pull request #1229 from chrox/fix_1166

Browse Source 
fix #1166 by auto alignment of option name
This commit is contained in:
HW
2014-11-23 13:12:35 +01:00
parent 65938c9f9a 3574865dcb
commit 9fcf9f5a88
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/ui/data/koptoptions.lua
View File

@@ -26,7 +26,7 @@ local KoptOptions = {
{
name = "trim_page",
name_text = S.PAGE_CROP,
width = 225,
width = 261,
toggle = {S.MANUAL, S.AUTO, S.SEMIAUTO},
alternate = false,
values = {0, 1, 2},

27
frontend/ui/widget/configdialog.lua
View File

@@ -139,11 +139,26 @@ end
local ConfigOption = CenterContainer:new{}
function ConfigOption:init()
-- make default styles
local default_name_font_size = 20
local default_item_font_size = 16
local default_items_spacing = 30
local default_option_height = 50
local default_option_padding = 15
local max_option_name_width = 0
for c = 1, #self.options do
local name_font_face = self.options[c].name_font_face and self.options[c].name_font_face or "cfont"
local name_font_size = self.options[c].name_font_size and self.options[c].name_font_size or default_name_font_size
local option_name_width = TextWidget:new{
text = self.options[c].name_text,
face = Font:getFace(name_font_face, name_font_size),
}:getSize().w
max_option_name_width = math.max(max_option_name_width, option_name_width)
end
local default_name_align_right = math.max((max_option_name_width + Screen:scaleByDPI(10))/Screen:getWidth(), 0.33)
local default_item_align_center = 1 - default_name_align_right
-- fill vertical group of config tab
local vertical_group = VerticalGroup:new{}
table.insert(vertical_group, VerticalSpan:new{
width = Screen:scaleByDPI(default_option_padding),
@@ -152,8 +167,8 @@ function ConfigOption:init()
for c = 1, #self.options do
local show_default = not self.options[c].advanced or show_advanced
if self.options[c].show ~= false and show_default then
local name_align = self.options[c].name_align_right and self.options[c].name_align_right or 0.33
local item_align = self.options[c].item_align_center and self.options[c].item_align_center or 0.66
local name_align = self.options[c].name_align_right and self.options[c].name_align_right or default_name_align_right
local item_align = self.options[c].item_align_center and self.options[c].item_align_center or default_item_align_center
local name_font_face = self.options[c].name_font_face and self.options[c].name_font_face or "cfont"
local name_font_size = self.options[c].name_font_size and self.options[c].name_font_size or default_name_font_size
local item_font_face = self.options[c].item_font_face and self.options[c].item_font_face or "cfont"
@@ -168,9 +183,9 @@ function ConfigOption:init()
local option_name_container = RightContainer:new{
dimen = Geom:new{ w = Screen:getWidth()*name_align, h = option_height},
}
local option_name = TextWidget:new{
text = self.options[c].name_text,
face = Font:getFace(name_font_face, name_font_size),
local option_name = TextWidget:new{
text = self.options[c].name_text,
face = Font:getFace(name_font_face, name_font_size),
}
table.insert(option_name_container, option_name)
table.insert(horizontal_group, option_name_container)
@@ -350,6 +365,8 @@ function ConfigOption:init()
local toggle_width = Screen:scaleByDPI(self.options[c].width or 216)
local switch = ToggleSwitch:new{
width = math.min(max_toggle_width, toggle_width),
font_face = item_font_face,
font_size = item_font_size,
name = self.options[c].name,
name_text = self.options[c].name_text,
toggle = self.options[c].toggle,

7
frontend/ui/widget/toggleswitch.lua
View File

@@ -29,15 +29,14 @@ local ToggleSwitch = InputContainer:new{
height = Screen:scaleByDPI(30),
bgcolor = Blitbuffer.COLOR_WHITE, -- unfoused item color
fgcolor = Blitbuffer.gray(0.5), -- focused item color
font_face = "cfont",
font_size = 16,
}
function ToggleSwitch:init()
self.n_pos = #self.toggle
self.position = nil
local label_font_face = "cfont"
local label_font_size = 16
self.toggle_frame = FrameContainer:new{
background = Blitbuffer.COLOR_WHITE,
color = Blitbuffer.gray(0.5),
@@ -51,7 +50,7 @@ function ToggleSwitch:init()
local label = ToggleLabel:new{
align = "center",
text = self.toggle[i],
face = Font:getFace(label_font_face, label_font_size),
face = Font:getFace(self.font_face, self.font_size),
}
local content = CenterContainer:new{
dimen = Geom:new{w = self.width/self.n_pos, h = self.height},