From 4a721d36a5518b45c76eef214642ee86b3ca754d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 5 Oct 2018 10:28:45 +0530 Subject: [PATCH] Load UI css at startup --- src/calibre/gui2/viewer2/web_view.py | 2 +- src/pyj/viewer-main.pyj | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/calibre/gui2/viewer2/web_view.py b/src/calibre/gui2/viewer2/web_view.py index 7aea35045f..eca3311168 100644 --- a/src/calibre/gui2/viewer2/web_view.py +++ b/src/calibre/gui2/viewer2/web_view.py @@ -224,7 +224,7 @@ class WebView(RestartingWebEngineView): if parent is not None: self.inspector = Inspector(parent.inspector_dock.toggleViewAction(), self) parent.inspector_dock.setWidget(self.inspector) - # QTimer.singleShot(100, lambda: (parent.inspector_dock.setVisible(True), parent.inspector_dock.setMinimumWidth(650))) + # QTimer.singleShot(300, lambda: (parent.inspector_dock.setVisible(True), parent.inspector_dock.setMinimumWidth(650))) @property def host_widget(self): diff --git a/src/pyj/viewer-main.pyj b/src/pyj/viewer-main.pyj index d515a12313..e378a63448 100644 --- a/src/pyj/viewer-main.pyj +++ b/src/pyj/viewer-main.pyj @@ -9,12 +9,14 @@ from gettext import gettext as _ import initialize # noqa: unused-import from ajax import ajax from book_list.globals import set_session_data -from modals import error_dialog, create_modal_container +from book_list.theme import get_color, get_font_family +from dom import get_widget_css, set_css +from modals import create_modal_container, error_dialog from qt import from_python, to_python from read_book.db import new_book from read_book.globals import runtime, ui_operations -from read_book.view import View from read_book.iframe import main as iframe_main +from read_book.view import View from session import session_defaults @@ -150,6 +152,9 @@ if window is window.top: document.body.appendChild(E.div(id='view')) window.onerror = onerror create_modal_container() + document.body.style.fontFamily = get_font_family() + document.head.appendChild(E.style(get_widget_css())) + set_css(document.body, background_color=get_color('window-background'), color=get_color('window-foreground')) else: # iframe iframe_main()