Merge from trunk

src/calibre/ebooks/oeb/display/paged.coffee

@@ -82,6 +82,17 @@ class PagedDisplay
         this.cols_per_screen = cols_per_screen
 
     layout: () ->
+        # Remove the top margin from the first child of body as that gets added
+        # to the top margin of body. This is done here just in case
+        # getComputedStyle() causes a relayout. The re-layout will be much
+        # faster before we implement the multi-column layout.
+        for node in document.body.childNodes
+            if node.nodeType == 1 # Element node
+                style = window.getComputedStyle(node)
+                if style.display in ['block', 'table']
+                    node.style.setProperty('margin-top', '0px')
+                    break
+
         ww = window.innerWidth
         wh = window.innerHeight
         body_height = wh - this.margin_bottom = this.margin_top
@@ -135,11 +146,6 @@ class PagedDisplay
                             priority = rule.style.getPropertyPriority(prop)
                             rule.style.setProperty(cprop, val, priority)
 
-        # Ensure that the top margin is correct, otherwise for some documents,
-        # webkit lays out the body with a lot of space on top
-        brect = document.body.getBoundingClientRect()
-        if brect.top > this.margin_top
-            bs.setProperty('margin-top', (this.margin_top - brect.top)+'px')
         this.in_paged_mode = true
         this.current_margin_side = sm
         return sm

src/calibre/gui2/dialogs/restore_library.py

@@ -100,9 +100,7 @@ def restore_database(db, parent=None):
                 'the database from the individual book '
                 'metadata. This is useful if the '
                 'database has been corrupted and you get a '
-                'blank list of books. Note that restoring only '
-                'restores books, not any settings stored in the '
-                'database, or any custom recipes.'
+                'blank list of books.'
                 '<p>Do you want to restore the database?')):
         return False
     db.conn.close()

src/calibre/gui2/viewer/documentview.py

@@ -928,6 +928,13 @@ class DocumentView(QWebView): # {{{
                 self.document.scroll_to(x=loc, y=0)
                 if self.manager is not None:
                     self.manager.scrolled(self.scroll_fraction)
+                event.accept()
+            elif self.manager is not None:
+                if direction == 'next':
+                    self.manager.next_document()
+                else:
+                    self.manager.previous_document()
+                event.accept()
             return
 
         if event.delta() < -14: