From 091164b307b29ed9e54b28868bb2bfbd872c9bcd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 24 Jul 2012 11:56:41 +0530
Subject: [PATCH] Refactor fs code in the viewer

---
 resources/compiled_coffeescript.zip     | Bin 49166 -> 51021 bytes
 src/calibre/gui2/viewer/documentview.py |  28 +++++-------------------
 src/calibre/gui2/viewer/javascript.py   |   4 +++-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index 7ec0f242309ec5f872fe9e527e47e71eaa145256..bb2ea7cfd95dcf122d4a96d2769f0e958940ea34 100644
GIT binary patch
delta 1258
zcmb7E&ubGw6y7AQEs@|4wyjz#BNjIH$D%z1r3mZAOSH81AWCJKB(urNW_H<`Z4*j~
z7mpUg+?C!fQhE{5M3CailNT={{sr1wFM>14CcE3D0VnLjy!qaj?|u8`Z9h+Z-A<&I
zvxy;D66^cg(f$|hO=>UsUfU;2Ifs4FM$aFt9cin#Ge7oDNs@T3O03=-J8gKDrIWmi
z5N3b0nIQlvsKadX9*?iK!u5Ca;oaf*t>8?>u#CVRpadahF_{E>86M74)5ah;V!!V`
z2vM<Du}saxx)Dg=R0gyNT5M4OKuac3O>9yVTDpY{s+XZ#G%?3vp4AuTn#EFI+*Vsy
zphtCF*`_wFI!GmO9r@&h{aUyb&k^?cOu9BeL5`?xHTSu&juaPB&&5&U#}sw*9tx%H
z#4X>oh&Zn8T1y;vksIS1nl8hNPEm#G8)ku)<^Vg)Oq^SXE+8EdrUBAC3fM<wWX^#_
zRL~11aV%KniYt2Fw%WOzHA==l?Ov=A9xm8<uZ%ENb9SMs5?Zyo-vj_rcjb}z^Bw{)
z3lyiqdqA{+SYeMiT7e$5L&v^d9h7h+NxL}qdUJgGxFu~z41=S(mJGH447OnYrYQT#
z|COy^8>3Jm!t#@Pg{{0CyWV5PiD>7nJk>)N?jgaq06-t_gmn?#NZJm#z;-uB*_1XC
zzJ@onmCMmPh|xy)+U{tRsaRZ2bjJ&uZBDYkjS2R&DYKuAEAh7}F-(}uw`56XFPh#=
mkkC7MT4Tz8eQSu+>5u^R8ClK_^AROU!~92MlJxmN?EV2HMyQ+s

delta 118
zcmX@x$K2Pzym>wE5eH_zIZrq8uHoHW?3Yw9neUj!<hMt~CqLlj&<XHnWD;Q(VE_T3
zA_oPd8wzE-3=AMF4HktFyBsDr9uu9+a!h1$v7gA~(qp9}tZX1j79dn*WMH_w55xli
DflVH_

diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index 76b57629cb..1afb284e8f 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -73,7 +73,6 @@ class Document(QWebPage): # {{{
         self.loaded_javascript = False
         self.js_loader = JavaScriptLoader(
                     dynamic_coffeescript=self.debug_javascript)
-        self.initial_left_margin = self.initial_right_margin = u''
         self.in_fullscreen_mode = False
 
         self.setLinkDelegationPolicy(self.DelegateAllLinks)
@@ -187,10 +186,7 @@ class Document(QWebPage): # {{{
         self.set_bottom_padding(0)
         self.fit_images()
         self.init_hyphenate()
-        self.initial_left_margin = unicode(self.javascript(
-                        'document.body.style.marginLeft').toString())
-        self.initial_right_margin = unicode(self.javascript(
-                        'document.body.style.marginRight').toString())
+        self.javascript('full_screen.save_margins()')
         if self.in_paged_mode:
             self.switch_to_paged_mode()
         if self.in_fullscreen_mode:
@@ -257,27 +253,13 @@ class Document(QWebPage): # {{{
 
     def switch_to_fullscreen_mode(self):
         self.in_fullscreen_mode = True
-        if self.in_paged_mode:
-            self.javascript('paged_display.max_col_width = %d'%self.max_fs_width)
-        else:
-            self.javascript('''
-                    var s = document.body.style;
-                    s.maxWidth = "%dpx";
-                    s.marginLeft = "auto";
-                    s.marginRight = "auto";
-                '''%self.max_fs_width)
+        self.javascript('full_screen.on(%d, %s)'%(self.max_fs_width,
+            'true' if self.in_paged_mode else 'false'))
 
     def switch_to_window_mode(self):
         self.in_fullscreen_mode = False
-        if self.in_paged_mode:
-            self.javascript('paged_display.max_col_width = %d'%-1)
-        else:
-            self.javascript('''
-                    var s = document.body.style;
-                    s.maxWidth = "none";
-                    s.marginLeft = "%s";
-                    s.marginRight = "%s";
-                '''%(self.initial_left_margin, self.initial_right_margin))
+        self.javascript('full_screen.off(%s)'%('true' if self.in_paged_mode
+            else 'false'))
 
     @pyqtSignature("QString")
     def debug(self, msg):
diff --git a/src/calibre/gui2/viewer/javascript.py b/src/calibre/gui2/viewer/javascript.py
index 2aedaf9e13..67404cb0c6 100644
--- a/src/calibre/gui2/viewer/javascript.py
+++ b/src/calibre/gui2/viewer/javascript.py
@@ -32,10 +32,12 @@ class JavaScriptLoader(object):
             'indexing':'ebooks.oeb.display.indexing',
             'paged':'ebooks.oeb.display.paged',
             'utils':'ebooks.oeb.display.utils',
+            'fs':'ebooks.oeb.display.full_screen',
         }
 
     ORDER = ('jquery', 'jquery_scrollTo', 'bookmarks', 'referencing', 'images',
-            'hyphenation', 'hyphenator', 'utils', 'cfi', 'indexing', 'paged')
+            'hyphenation', 'hyphenator', 'utils', 'cfi', 'indexing', 'paged',
+            'fs')
 
 
     def __init__(self, dynamic_coffeescript=False):