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

E-book viewer: Fix 0px margins not being respected when the option to override book margins is turned off. See #1608458 (ebook viewer: epub page margins bigger each chapter)

Browse Source
This commit is contained in:
Kovid Goyal 2016-08-04 05:22:04 +05:30
parent ece360f04c
commit fd60afd97e
2 changed files with 8 additions and 3 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.

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

@ -107,9 +107,14 @@ class PagedDisplay
set_geometry: (cols_per_screen=1, margin_top=20, margin_side=40, margin_bottom=20) ->
this.cols_per_screen = cols_per_screen
if this.use_document_margins and this.document_margins != null
this.margin_top = this.document_margins.top or margin_top
this.margin_bottom = this.document_margins.bottom or margin_bottom
this.margin_side = this.document_margins.left or this.document_margins.right or margin_side
this.margin_top = if this.document_margins.top != null then this.document_margins.top else margin_top
this.margin_bottom = if this.document_margins.bottom != null then this.document_margins.bottom else margin_bottom
if this.document_margins.left != null
this.margin_side = this.document_margins.left
else if this.document_margins.right != null
this.margin_side = this.document_margins.right
else
this.margin_side = margin_side
this.effective_margin_top = this.margin_top
this.effective_margin_bottom = this.margin_bottom
else