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

ReaderDogEar: Enforce a minimum size, too (#7369)

Browse Source 
* Add a semi-transparent version of the dogear icon
* Ensure the dogear won't become too tiny to be useful
This commit is contained in:
NiLuJe
2021-03-01 01:35:55 +01:00
committed by GitHub
parent f9635bc41b
commit 5303165bf9
2 changed files with 63 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,8 @@ function ReaderDogear:init()
-- to not overwrite the book text.
-- For other documents, there is no easy way to know if valuable content
-- may be hidden by the icon (kopt's page_margin is quite obscure).
self.dogear_max_size = math.ceil( math.min(Screen:getWidth(), Screen:getHeight()) / 32)
self.dogear_min_size = math.ceil(math.min(Screen:getWidth(), Screen:getHeight()) / 40)
self.dogear_max_size = math.ceil(math.min(Screen:getWidth(), Screen:getHeight()) / 32)
self.dogear_size = nil
self.dogear_y_offset = 0
self.top_pad = nil
@@ -38,10 +39,11 @@ function ReaderDogear:setupDogear(new_dogear_size)
self.vgroup = VerticalGroup:new{
self.top_pad,
IconWidget:new{
icon = "dogear.opaque",
icon = "dogear.alpha",
rotation_angle = BD.mirroredUILayout() and 90 or 0,
width = self.dogear_size,
height = self.dogear_size,
alpha = true, -- Keep the alpha layer intact
}
}
self[1] = RightContainer:new{
@@ -79,7 +81,7 @@ function ReaderDogear:onSetPageMargins(margins)
-- top & right margins and be sure no text is hidden by the icon
-- (the provided margins are not scaled, so do as ReaderTypeset)
local margin = Screen:scaleBySize(math.max(margin_top, margin_right))
local new_dogear_size = math.min(self.dogear_max_size, margin)
local new_dogear_size = math.min(self.dogear_max_size, math.max(self.dogear_min_size, margin))
self:setupDogear(new_dogear_size)
end