From 42cbbc82843a817e41cc898f6462b702c8778eac Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 27 Jul 2012 16:08:32 +0530
Subject: [PATCH] Paged display: Much more efficient handling of the body
 margin collapse problem

---
 src/calibre/ebooks/oeb/display/paged.coffee | 34 +++++----------------
 src/calibre/ebooks/pdf/writer.py            |  1 -
 src/calibre/gui2/viewer/documentview.py     |  1 -
 src/calibre/gui2/viewer/printing.py         |  1 -
 4 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index 3b9682b590..de6645ce88 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -75,25 +75,12 @@ class PagedDisplay
         # start_time = new Date().getTime()
         body_style = window.getComputedStyle(document.body)
         bs = document.body.style
-        # When laying body out in columns, webkit bleeds the top margin of the
-        # first block element out above the columns, leading to an extra top
-        # margin for the page. We compensate for that here. Computing the
-        # boundingrect of body is very expensive with column layout, so we do
-        # it before the column layout is applied.
         first_layout = false
         if not this.in_paged_mode
-            bs.setProperty('margin-top', '0px')
-            extra_margin = document.body.getBoundingClientRect().top
-            if extra_margin <= this.margin_top
-                extra_margin = 0
-            margin_top = (this.margin_top - extra_margin) + 'px'
             # Check if the current document is a full screen layout like
             # cover, if so we treat it specially.
             single_screen = (document.body.scrollWidth < window.innerWidth + 25 and document.body.scrollHeight < window.innerHeight + 25)
             first_layout = true
-        else
-            # resize event
-            margin_top = body_style.marginTop
 
         ww = window.innerWidth
 
@@ -124,10 +111,16 @@ class PagedDisplay
         bs.setProperty('-webkit-column-gap', (2*sm)+'px')
         bs.setProperty('-webkit-column-width', col_width+'px')
         bs.setProperty('-webkit-column-rule-color', fgcolor)
+
+        # Without this, webkit bleeds the margin of the first block(s) of body
+        # above the columns, which causes them to effectively be added to the
+        # page margins (the margin collapse algorithm)
+        bs.setProperty('-webkit-margin-collapse', 'separate')
+
         bs.setProperty('overflow', 'visible')
         bs.setProperty('height', (window.innerHeight - this.margin_top - this.margin_bottom) + 'px')
         bs.setProperty('width', (window.innerWidth - 2*sm)+'px')
-        bs.setProperty('margin-top', margin_top)
+        bs.setProperty('margin-top', this.margin_top + 'px')
         bs.setProperty('margin-bottom', this.margin_bottom+'px')
         bs.setProperty('margin-left', sm+'px')
         bs.setProperty('margin-right', sm+'px')
@@ -209,19 +202,6 @@ class PagedDisplay
                 img.style.setProperty('display', 'block')
             calibre_utils.store(img, 'height-limited', true)
 
-    check_top_margin: () ->
-        # This is needed to handle the case when a descendant of body specifies
-        # a top margin as a percentage, which messes up the top margin
-        # calculations above
-        tm = document.body.getBoundingClientRect().top
-        if tm != this.margin_top
-            document.body.style.setProperty('margin-top', '0px')
-            tm = document.body.getBoundingClientRect().top
-            if tm <= this.margin_top
-                tm = 0
-            m = this.margin_top - tm
-            document.body.style.setProperty('margin-top', m+'px')
-
     scroll_to_pos: (frac) ->
         # Scroll to the position represented by frac (number between 0 and 1)
         xpos = Math.floor(document.body.scrollWidth * frac)
diff --git a/src/calibre/ebooks/pdf/writer.py b/src/calibre/ebooks/pdf/writer.py
index db0276b8ee..7e179cef48 100644
--- a/src/calibre/ebooks/pdf/writer.py
+++ b/src/calibre/ebooks/pdf/writer.py
@@ -202,7 +202,6 @@ class PDFWriter(QObject): # {{{
         paged_display.set_geometry(1, 0, 0, 0);
         paged_display.layout();
         paged_display.fit_images();
-        paged_display.check_top_margin();
         ''')
         mf = self.view.page().mainFrame()
         while True:
diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index dac9a05113..2b494d4ecd 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -243,7 +243,6 @@ class Document(QWebPage): # {{{
             sz.setWidth(scroll_width+side_margin)
             self.setPreferredContentsSize(sz)
         self.javascript('window.paged_display.fit_images()')
-        self.javascript('window.paged_display.check_top_margin()')
 
     @property
     def column_boundaries(self):
diff --git a/src/calibre/gui2/viewer/printing.py b/src/calibre/gui2/viewer/printing.py
index 476cd949f5..f860edb12c 100644
--- a/src/calibre/gui2/viewer/printing.py
+++ b/src/calibre/gui2/viewer/printing.py
@@ -71,7 +71,6 @@ class Printing(QObject):
                 paged_display.set_geometry(1, 0, 0, 0);
                 paged_display.layout();
                 paged_display.fit_images();
-                paged_display.check_top_margin();
             ''')
 
             while True: