Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 18:24:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Paged mode: Better handling of cover pages

Browse Source
This commit is contained in:
Kovid Goyal 2012-06-22 10:06:07 +05:30
parent f3bd716830
commit 24d84289ff
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/compiled_coffeescript.zip
View File

Binary file not shown.

21
src/calibre/ebooks/oeb/display/paged.coffee
View File

@ -69,7 +69,7 @@ class PagedDisplay
this.current_margin_side = 0 this.current_margin_side = 0
this.is_full_screen_layout = false this.is_full_screen_layout = false
set_geometry: (cols_per_screen=2, margin_top=20, margin_side=40, margin_bottom=20) -> set_geometry: (cols_per_screen=1, margin_top=20, margin_side=40, margin_bottom=20) ->
this.margin_top = margin_top this.margin_top = margin_top
this.margin_side = margin_side this.margin_side = margin_side
this.margin_bottom = margin_bottom this.margin_bottom = margin_bottom
@ -82,13 +82,15 @@ class PagedDisplay
# margin for the page. We compensate for that here. Computing the # margin for the page. We compensate for that here. Computing the
# boundingrect of body is very expensive with column layout, so we do # boundingrect of body is very expensive with column layout, so we do
# it before the column layout is applied. # it before the column layout is applied.
first_layout = false
if not this.in_paged_mode if not this.in_paged_mode
document.body.style.marginTop = '0px' document.body.style.marginTop = '0px'
extra_margin = document.body.getBoundingClientRect().top extra_margin = document.body.getBoundingClientRect().top
margin_top = (this.margin_top - extra_margin) + 'px' margin_top = (this.margin_top - extra_margin) + 'px'
# Check if the current document is a full screen layout like an # Check if the current document is a full screen layout like
# epub cover, if so we treat it specially. # cover, if so we treat it specially.
this.is_full_screen_layout = (document.body.scrollWidth < window.innerWidth + 25 and document.body.scrollHeight < window.innerHeight + 25) single_screen = (document.body.scrollWidth < window.innerWidth + 25 and document.body.scrollHeight < window.innerHeight + 25)
first_layout = true
else else
# resize event # resize event
margin_top = body_style.marginTop margin_top = body_style.marginTop
@ -119,7 +121,7 @@ class PagedDisplay
bs.setProperty('-webkit-column-rule-color', fgcolor) bs.setProperty('-webkit-column-rule-color', fgcolor)
bs.setProperty('overflow', 'visible') bs.setProperty('overflow', 'visible')
bs.setProperty('height', (window.innerHeight - this.margin_top - this.margin_bottom) + 'px') bs.setProperty('height', (window.innerHeight - this.margin_top - this.margin_bottom) + 'px')
bs.setProperty('width', 'auto') bs.setProperty('width', (window.innerWidth - 2*sm)+'px')
bs.setProperty('margin-top', margin_top) bs.setProperty('margin-top', margin_top)
bs.setProperty('margin-bottom', this.margin_bottom+'px') bs.setProperty('margin-bottom', this.margin_bottom+'px')
bs.setProperty('margin-left', sm+'px') bs.setProperty('margin-left', sm+'px')
@ -143,6 +145,15 @@ class PagedDisplay
priority = rule.style.getPropertyPriority(prop) priority = rule.style.getPropertyPriority(prop)
rule.style.setProperty(cprop, val, priority) rule.style.setProperty(cprop, val, priority)
if first_layout
# Because of a bug in webkit column mode, svg elements defined with
# width 100% are wider than body and lead to a blank page after the
# current page (when cols_per_screen == 1). Similarly img elements
# with height=100% overflow the first column
has_svg = document.getElementsByTagName('svg').length > 0
only_img = document.getElementsByTagName('img').length == 1 and document.getElementsByTagName('div').length < 2 and document.getElementsByTagName('p').length < 2
this.is_full_screen_layout = (only_img or has_svg) and single_screen and document.body.scrollWidth > document.body.clientWidth
this.in_paged_mode = true this.in_paged_mode = true
this.current_margin_side = sm this.current_margin_side = sm
return sm return sm