|
|
|
local BD = require("ui/bidi")
|
|
|
|
local Blitbuffer = require("ffi/blitbuffer")
|
|
|
|
local Button = require("ui/widget/button")
|
|
|
|
local CenterContainer = require("ui/widget/container/centercontainer")
|
|
|
|
local CloseButton = require("ui/widget/closebutton")
|
|
|
|
local Device = require("device")
|
|
|
|
local Event = require("ui/event")
|
|
|
|
local Font = require("ui/font")
|
|
|
|
local FrameContainer = require("ui/widget/container/framecontainer")
|
|
|
|
local FocusManager = require("ui/widget/focusmanager")
|
|
|
|
local Geom = require("ui/geometry")
|
|
|
|
local GestureRange = require("ui/gesturerange")
|
|
|
|
local HorizontalGroup = require("ui/widget/horizontalgroup")
|
|
|
|
local HorizontalSpan = require("ui/widget/horizontalspan")
|
|
|
|
local LineWidget = require("ui/widget/linewidget")
|
|
|
|
local Math = require("optmath")
|
|
|
|
local MovableContainer = require("ui/widget/container/movablecontainer")
|
|
|
|
local OverlapGroup = require("ui/widget/overlapgroup")
|
|
|
|
local ProgressWidget = require("ui/widget/progresswidget")
|
|
|
|
local Size = require("ui/size")
|
|
|
|
local TextWidget = require("ui/widget/textwidget")
|
|
|
|
local UIManager = require("ui/uimanager")
|
|
|
|
local VerticalGroup = require("ui/widget/verticalgroup")
|
|
|
|
local VerticalSpan = require("ui/widget/verticalspan")
|
|
|
|
local WidgetContainer = require("ui/widget/container/widgetcontainer")
|
|
|
|
local _ = require("gettext")
|
|
|
|
local Screen = Device.screen
|
|
|
|
|
|
|
|
local SkimToWidget = FocusManager:new{
|
|
|
|
title_face = Font:getFace("x_smalltfont"),
|
|
|
|
width = nil,
|
|
|
|
height = nil,
|
|
|
|
}
|
|
|
|
|
|
|
|
function SkimToWidget:init()
|
|
|
|
self.buttons_layout = {}
|
|
|
|
self.selected = { x = 1, y = 2 }
|
|
|
|
self.medium_font_face = Font:getFace("ffont")
|
|
|
|
self.screen_width = Screen:getWidth()
|
|
|
|
self.screen_height = Screen:getHeight()
|
|
|
|
self.span = math.ceil(self.screen_height * 0.01)
|
|
|
|
self.width = math.floor(self.screen_width * 0.95)
|
|
|
|
self.button_bordersize = Size.border.button
|
|
|
|
-- the buttons need some kind of separation but maybe I should just implement
|
|
|
|
-- margin_left and margin_right…
|
|
|
|
self.button_margin = self.button_bordersize
|
|
|
|
self.button_width = math.floor(self.screen_width * 0.16) - (2*self.button_margin)
|
|
|
|
if Device:hasKeys() then
|
|
|
|
self.key_events.Close = { { "Back" }, doc = "close skimto page" }
|
|
|
|
end
|
|
|
|
if Device:isTouchDevice() then
|
|
|
|
self.ges_events = {
|
|
|
|
TapProgress = {
|
|
|
|
GestureRange:new{
|
|
|
|
ges = "tap",
|
|
|
|
range = Geom:new{
|
|
|
|
x = 0, y = 0,
|
|
|
|
w = self.screen_width,
|
|
|
|
h = self.screen_height,
|
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
end
|
|
|
|
local dialog_title = _("Skim")
|
|
|
|
self.curr_page = self.ui:getCurrentPage()
|
|
|
|
self.page_count = self.document:getPageCount()
|
|
|
|
|
|
|
|
local curr_page_display = tostring(self.curr_page)
|
|
|
|
if self.ui.pagemap and self.ui.pagemap:wantsPageLabels() then
|
|
|
|
curr_page_display = self.ui.pagemap:getCurrentPageLabel(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
self.ticks_flattened = self.ui.toc:getTocTicksFlattened()
|
|
|
|
|
|
|
|
local skimto_title = FrameContainer:new{
|
|
|
|
padding = Size.padding.default,
|
|
|
|
margin = Size.margin.title,
|
|
|
|
bordersize = 0,
|
|
|
|
TextWidget:new{
|
|
|
|
text = dialog_title,
|
|
|
|
face = self.title_face,
|
|
|
|
bold = true,
|
|
|
|
max_width = math.floor(self.screen_width * 0.95),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
self.progress_bar = ProgressWidget:new{
|
|
|
|
width = math.floor(self.screen_width * 0.9),
|
|
|
|
height = Size.item.height_big,
|
|
|
|
percentage = self.curr_page / self.page_count,
|
|
|
|
ticks = self.ticks_flattened,
|
|
|
|
tick_width = Size.line.medium,
|
|
|
|
last = self.page_count,
|
|
|
|
alt = self.ui.document.flows,
|
|
|
|
}
|
|
|
|
self.skimto_progress = FrameContainer:new{
|
|
|
|
padding = Size.padding.button,
|
|
|
|
margin = Size.margin.small,
|
|
|
|
bordersize = 0,
|
|
|
|
self.progress_bar,
|
|
|
|
}
|
|
|
|
|
|
|
|
local skimto_line = LineWidget:new{
|
|
|
|
dimen = Geom:new{
|
|
|
|
w = self.width,
|
|
|
|
h = Size.line.thick,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
local skimto_bar = OverlapGroup:new{
|
|
|
|
dimen = {
|
|
|
|
w = self.width,
|
|
|
|
h = skimto_title:getSize().h
|
|
|
|
},
|
|
|
|
skimto_title,
|
|
|
|
CloseButton:new{ window = self, padding_top = Size.margin.title, },
|
|
|
|
}
|
|
|
|
local button_minus = Button:new{
|
|
|
|
text = "-1",
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToPage(self.curr_page - 1)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
local button_minus_ten = Button:new{
|
|
|
|
text = "-10",
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToPage(self.curr_page - 10)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
local button_plus = Button:new{
|
|
|
|
text = "+1",
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToPage(self.curr_page + 1)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
local button_plus_ten = Button:new{
|
|
|
|
text = "+10",
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToPage(self.curr_page + 10)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
self.current_page_text = Button:new{
|
|
|
|
text = curr_page_display,
|
|
|
|
bordersize = 0,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
padding = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = math.floor(self.screen_width * 0.2) - (2*self.button_margin),
|
|
|
|
show_parent = self,
|
|
|
|
callback = function()
|
|
|
|
self.callback_switch_to_goto()
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
|
|
|
|
local chapter_next_text = "▷│"
|
|
|
|
local chapter_prev_text = "│◁"
|
|
|
|
local bookmark_next_text = "☆▷"
|
|
|
|
local bookmark_prev_text = "◁☆"
|
|
|
|
if BD.mirroredUILayout() then
|
|
|
|
chapter_next_text, chapter_prev_text = chapter_prev_text, chapter_next_text
|
|
|
|
bookmark_next_text, bookmark_prev_text = bookmark_prev_text, bookmark_next_text
|
|
|
|
end
|
|
|
|
local button_chapter_next = Button:new{
|
|
|
|
text = chapter_next_text,
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Tame some ButtonTable users into re-using Buttontable instances if possible (#7166)
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things.
* SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button.
* Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change).
* Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome.
* ConfigDialog: Free everything that's going to be re-instatiated on update
* A few more post #7118 fixes:
* SkimTo: Always flag the chapter nav buttons as vsync
* Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch).
* Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton
* ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;).
* Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;).
* Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;).
* Minor documentation tweaks around UIManager's `setDirty` to reflect that change.
* ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it).
* ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
local page = self.ui.toc:getNextChapter(self.curr_page)
|
|
|
|
if page and page >=1 and page <= self.page_count then
|
|
|
|
self:goToPage(page)
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
hold_callback = function()
|
|
|
|
self:goToPage(self.page_count)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
|
|
|
|
local button_chapter_prev = Button:new{
|
|
|
|
text = chapter_prev_text,
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Tame some ButtonTable users into re-using Buttontable instances if possible (#7166)
* QuickDictLookup, ImageViewer, NumberPicker: Smarter `update` that will re-use most of the widget's layout instead of re-instantiating all the things.
* SpinWidget/DoubleSpinWidget: The NumberPicker change above renders a hack to preserve alpha on these widgets almost unnecessary. Also fixed said hack to also apply to the center, value button.
* Button: Don't re-instantiate the frame in setText/setIcon when unnecessary (e.g., no change at all, or no layout change).
* Button: Add a refresh method that repaints and refreshes a *specific* Button (provided it's been painted once) all on its lonesome.
* ConfigDialog: Free everything that's going to be re-instatiated on update
* A few more post #7118 fixes:
* SkimTo: Always flag the chapter nav buttons as vsync
* Button: Fix the highlight on rounded buttons when vsync is enabled (e.g., it's now entirely visible, instead of showing a weird inverted corner glitch).
* Some more heuristic tweaks in Menu/TouchMenu/Button/IconButton
* ButtonTable: fix the annoying rounding issue I'd noticed in #7054 ;).
* Enable dithering in TextBoxWidget (e.g., in the Wikipedia full view). This involved moving the HW dithering align fixup to base, where it always ought to have been ;).
* Switch a few widgets that were using "partial" on close to "ui", or, more rarely, "flashui". The intent being to limit "partial" purely to the Reader, because it has a latency cost when mixed with other refreshes, which happens often enough in UI ;).
* Minor documentation tweaks around UIManager's `setDirty` to reflect that change.
* ReaderFooter: Force a footer repaint on resume if it is visible (otherwise, just update it).
* ReaderBookmark: In the same vein, don't repaint an invisible footer on bookmark count changes.
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
local page = self.ui.toc:getPreviousChapter(self.curr_page)
|
|
|
|
if page and page >=1 and page <= self.page_count then
|
|
|
|
self:goToPage(page)
|
|
|
|
end
|
|
|
|
end,
|
|
|
|
hold_callback = function()
|
|
|
|
self:goToPage(1)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
|
|
|
|
local button_bookmark_next = Button:new{
|
|
|
|
text = bookmark_next_text,
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToByEvent("GotoNextBookmarkFromPage")
|
|
|
|
end,
|
|
|
|
hold_callback = function()
|
|
|
|
local page = self.ui.bookmark:getLastBookmarkedPageFromPage(self.ui:getCurrentPage())
|
|
|
|
self:goToBookmark(page)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
|
|
|
|
local button_bookmark_prev = Button:new{
|
|
|
|
text = bookmark_prev_text,
|
|
|
|
bordersize = self.button_bordersize,
|
|
|
|
margin = self.button_margin,
|
|
|
|
radius = 0,
|
|
|
|
enabled = true,
|
|
|
|
width = self.button_width,
|
|
|
|
show_parent = self,
|
Revamp "flash_ui" handling (#7118)
* Wherever possible, do an actual dumb invert on the Screen BB instead of repainting the widget, *then* inverting it (which is what the "invert" flag does).
* Instead of playing with nextTick/tickAfterNext delays, explicitly fence stuff with forceRePaint
* And, in the few cases where said Mk. 7 quirk kicks in, make the fences more marked by using a well-placed WAIT_FOR_UPDATE_COMPLETE
* Fix an issue in Button where show/hide & enable/disable where actually all toggles, which meant that duplicate calls or timing issues would do the wrong thing. (This broke dimming some icons, and mistakenly dropped the background from FM chevrons, for example).
* Speaking of, fix Button's hide/show to actually restore the background properly (there was a stupid typo in the variable name)
* Still in Button, fix the insanity of the double repaint on rounded buttons. Turns out it made sense, after all (and was related to said missing background, and bad interaction with invert & text with no background).
* KeyValuePage suffered from a similar issue with broken highlights (all black) because of missing backgrounds.
* In ConfigDialog, only instanciate IconButtons once (because every tab switch causes a full instantiation; and the initial display implies a full instanciation and an initial tab switch). Otherwise, both instances linger, and catch taps, and as such, double highlights.
* ConfigDialog: Restore the "don't repaint ReaderUI" when switching between similarly sized tabs (re #6131). I never could reproduce that on eInk, and I can't now on the emulator, so I'm assuming @poire-z fixed it during the swap to SVG icons.
* KeyValuePage: Only instanciate Buttons once (again, this is a widget that goes through a full init every page). Again, caused highlight/dimming issues because buttons were stacked.
* Menu: Ditto.
* TouchMenu: Now home of the gnarliest unhilight heuristics, because of the sheer amount of different things that can happen (and/or thanks to stuff not flagged covers_fullscreen properly ;p).
* Bump base
https://github.com/koreader/koreader-base/pull/1280
https://github.com/koreader/koreader-base/pull/1282
https://github.com/koreader/koreader-base/pull/1283
https://github.com/koreader/koreader-base/pull/1284
* Bump android-luajit-launcher
https://github.com/koreader/android-luajit-launcher/pull/284
https://github.com/koreader/android-luajit-launcher/pull/285
https://github.com/koreader/android-luajit-launcher/pull/286
https://github.com/koreader/android-luajit-launcher/pull/287
4 years ago
|
|
|
vsync = true,
|
|
|
|
callback = function()
|
|
|
|
self:goToByEvent("GotoPreviousBookmarkFromPage")
|
|
|
|
end,
|
|
|
|
hold_callback = function()
|
|
|
|
local page = self.ui.bookmark:getFirstBookmarkedPageFromPage(self.ui:getCurrentPage())
|
|
|
|
self:goToBookmark(page)
|
|
|
|
end,
|
|
|
|
}
|
|
|
|
|
|
|
|
local horizontal_span_up = HorizontalSpan:new{ width = math.floor(self.screen_width * 0.2) }
|
|
|
|
local button_table_up = HorizontalGroup:new{
|
|
|
|
align = "center",
|
|
|
|
button_chapter_prev,
|
|
|
|
button_bookmark_prev,
|
|
|
|
horizontal_span_up,
|
|
|
|
button_bookmark_next,
|
|
|
|
button_chapter_next,
|
|
|
|
}
|
|
|
|
|
|
|
|
local vertical_group_up = VerticalGroup:new{ align = "center" }
|
|
|
|
local padding_span_up = VerticalSpan:new{ width = math.ceil(self.screen_height * 0.015) }
|
|
|
|
table.insert(vertical_group_up, padding_span_up)
|
|
|
|
table.insert(vertical_group_up, button_table_up)
|
|
|
|
table.insert(vertical_group_up, padding_span_up)
|
|
|
|
|
|
|
|
local button_table_down = HorizontalGroup:new{
|
|
|
|
align = "center",
|
|
|
|
button_minus,
|
|
|
|
button_minus_ten,
|
|
|
|
self.current_page_text,
|
|
|
|
button_plus_ten,
|
|
|
|
button_plus,
|
|
|
|
}
|
|
|
|
local vertical_group_down = VerticalGroup:new{ align = "center" }
|
|
|
|
local padding_span = VerticalSpan:new{ width = math.ceil(self.screen_height * 0.015) }
|
|
|
|
table.insert(vertical_group_down, padding_span)
|
|
|
|
table.insert(vertical_group_down, button_table_down)
|
|
|
|
table.insert(vertical_group_down, padding_span)
|
|
|
|
|
|
|
|
self.skimto_frame = FrameContainer:new{
|
|
|
|
radius = Size.radius.window,
|
|
|
|
bordersize = Size.border.window,
|
|
|
|
padding = 0,
|
|
|
|
margin = 0,
|
|
|
|
background = Blitbuffer.COLOR_WHITE,
|
|
|
|
VerticalGroup:new{
|
|
|
|
align = "center",
|
|
|
|
skimto_bar,
|
|
|
|
skimto_line,
|
|
|
|
vertical_group_up,
|
|
|
|
CenterContainer:new{
|
|
|
|
dimen = Geom:new{
|
|
|
|
w = skimto_line:getSize().w,
|
|
|
|
h = self.skimto_progress:getSize().h,
|
|
|
|
},
|
|
|
|
self.skimto_progress,
|
|
|
|
},
|
|
|
|
vertical_group_down,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
self.movable = MovableContainer:new{
|
|
|
|
-- alpha = 0.8,
|
|
|
|
self.skimto_frame,
|
|
|
|
}
|
|
|
|
self[1] = WidgetContainer:new{
|
|
|
|
align = "center",
|
|
|
|
dimen =Geom:new{
|
|
|
|
x = 0, y = 0,
|
|
|
|
w = self.screen_width,
|
|
|
|
h = self.screen_height,
|
|
|
|
},
|
|
|
|
self.movable,
|
|
|
|
}
|
|
|
|
|
|
|
|
if Device:hasDPad() then
|
|
|
|
self.buttons_layout = {
|
|
|
|
{ button_chapter_prev, button_bookmark_prev, button_bookmark_next, button_chapter_next },
|
|
|
|
{ button_minus, button_minus_ten, button_plus_ten, button_plus },
|
|
|
|
}
|
|
|
|
self.layout = self.buttons_layout
|
|
|
|
self.layout[2][1]:onFocus()
|
|
|
|
self.key_events.SelectByKeyPress = { { "Press" }, doc = "select focused item" }
|
|
|
|
end
|
|
|
|
if Device:hasKeyboard() then
|
|
|
|
self.key_events.QKey = { { "Q" }, event = "FirstRowKeyPress", args = 0 }
|
|
|
|
self.key_events.WKey = { { "W" }, event = "FirstRowKeyPress", args = 0.11 }
|
|
|
|
self.key_events.EKey = { { "E" }, event = "FirstRowKeyPress", args = 0.22 }
|
|
|
|
self.key_events.RKey = { { "R" }, event = "FirstRowKeyPress", args = 0.33 }
|
|
|
|
self.key_events.TKey = { { "T" }, event = "FirstRowKeyPress", args = 0.44 }
|
|
|
|
self.key_events.YKey = { { "Y" }, event = "FirstRowKeyPress", args = 0.55 }
|
|
|
|
self.key_events.UKey = { { "U" }, event = "FirstRowKeyPress", args = 0.66 }
|
|
|
|
self.key_events.IKey = { { "I" }, event = "FirstRowKeyPress", args = 0.77 }
|
|
|
|
self.key_events.OKey = { { "O" }, event = "FirstRowKeyPress", args = 0.88 }
|
|
|
|
self.key_events.PKey = { { "P" }, event = "FirstRowKeyPress", args = 1 }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:update()
|
|
|
|
if self.curr_page <= 0 then
|
|
|
|
self.curr_page = 1
|
|
|
|
end
|
|
|
|
if self.curr_page > self.page_count then
|
|
|
|
self.curr_page = self.page_count
|
|
|
|
end
|
|
|
|
self.progress_bar.percentage = self.curr_page / self.page_count
|
|
|
|
local curr_page_display = tostring(self.curr_page)
|
|
|
|
if self.ui.pagemap and self.ui.pagemap:wantsPageLabels() then
|
|
|
|
curr_page_display = self.ui.pagemap:getCurrentPageLabel(true)
|
|
|
|
end
|
|
|
|
self.current_page_text:setText(curr_page_display, self.current_page_text.width)
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:addOriginToLocationStack(add_current)
|
|
|
|
-- Only add the page from which we launched the SkimToWidget
|
|
|
|
-- to the location stack, unless add_current = true
|
|
|
|
if not self.orig_page_added_to_stack or add_current then
|
|
|
|
self.ui.link:addCurrentLocationToStack()
|
|
|
|
self.orig_page_added_to_stack = true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onCloseWidget()
|
|
|
|
UIManager:setDirty(nil, function()
|
|
|
|
return "ui", self.skimto_frame.dimen
|
|
|
|
end)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onShow()
|
|
|
|
UIManager:setDirty(self, function()
|
|
|
|
return "ui", self.skimto_frame.dimen
|
|
|
|
end)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:goToPage(page)
|
|
|
|
self.curr_page = page
|
|
|
|
self:addOriginToLocationStack()
|
|
|
|
self.ui:handleEvent(Event:new("GotoPage", self.curr_page))
|
|
|
|
self:update()
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:goToBookmark(page)
|
|
|
|
if page then
|
|
|
|
self:addOriginToLocationStack()
|
|
|
|
self.ui.bookmark:gotoBookmark(page)
|
|
|
|
self.curr_page = self.ui:getCurrentPage()
|
|
|
|
self:update()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:goToByEvent(event_name)
|
|
|
|
if event_name then
|
|
|
|
self:addOriginToLocationStack()
|
|
|
|
self.ui:handleEvent(Event:new(event_name, false))
|
|
|
|
-- add_current_location_to_stack=false, as we handled it here
|
|
|
|
self.curr_page = self.ui:getCurrentPage()
|
|
|
|
self:update()
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onAnyKeyPressed()
|
|
|
|
UIManager:close(self)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onSelectByKeyPress()
|
|
|
|
local item = self:getFocusItem()
|
|
|
|
item.callback()
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onFirstRowKeyPress(percent)
|
|
|
|
local page = Math.round(percent * self.page_count)
|
|
|
|
self:addOriginToLocationStack()
|
|
|
|
self.ui:handleEvent(Event:new("GotoPage", page ))
|
|
|
|
self.curr_page = page
|
|
|
|
self:update()
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onTapProgress(arg, ges_ev)
|
|
|
|
if ges_ev.pos:intersectWith(self.progress_bar.dimen) then
|
|
|
|
local perc = self.progress_bar:getPercentageFromPosition(ges_ev.pos)
|
|
|
|
if not perc then
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
local page = Math.round(perc * self.page_count)
|
|
|
|
self:addOriginToLocationStack()
|
|
|
|
self.ui:handleEvent(Event:new("GotoPage", page ))
|
|
|
|
self.curr_page = page
|
|
|
|
self:update()
|
|
|
|
elseif not ges_ev.pos:intersectWith(self.skimto_frame.dimen) then
|
|
|
|
-- close if tap outside
|
|
|
|
self:onClose()
|
|
|
|
end
|
|
|
|
-- otherwise, do nothing (it's easy missing taping a button)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
function SkimToWidget:onClose()
|
|
|
|
UIManager:close(self)
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
return SkimToWidget
|