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

Prevent flash of unstyled emptiness in preview panel during load

Browse Source 
This is particularly noticeable in dark mode where the unstyled
emptiness is light colored
This commit is contained in:
Kovid Goyal 2020-07-29 23:35:03 +05:30
parent 2baff1954d
commit 252d6dacec
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/calibre/gui2/tweak_book/preview.py
View File

@ -11,8 +11,8 @@ from functools import partial
from threading import Thread from threading import Thread
from PyQt5.Qt import ( from PyQt5.Qt import (
QApplication, QByteArray, QHBoxLayout, QIcon, QMenu, QSize, QTimer, QToolBar, QApplication, QByteArray, QHBoxLayout, QIcon, QLabel, QMenu, QSize, QSizePolicy,
QUrl, QVBoxLayout, QWidget, pyqtSignal QStackedLayout, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal
) )
from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler
from PyQt5.QtWebEngineWidgets import ( from PyQt5.QtWebEngineWidgets import (
@ -467,6 +467,8 @@ class Preview(QWidget):
self.l = l = QVBoxLayout() self.l = l = QVBoxLayout()
self.setLayout(l) self.setLayout(l)
l.setContentsMargins(0, 0, 0, 0) l.setContentsMargins(0, 0, 0, 0)
self.stack = QStackedLayout(l)
self.stack.setStackingMode(self.stack.StackAll)
self.current_sync_retry_count = 0 self.current_sync_retry_count = 0
self.view = WebView(self) self.view = WebView(self)
self.view._page.bridge.request_sync.connect(self.request_sync) self.view._page.bridge.request_sync.connect(self.request_sync)
@ -478,7 +480,14 @@ class Preview(QWidget):
self.view.render_process_restarted.connect(self.render_process_restarted) self.view.render_process_restarted.connect(self.render_process_restarted)
self.pending_go_to_anchor = None self.pending_go_to_anchor = None
self.inspector = self.view.inspector self.inspector = self.view.inspector
l.addWidget(self.view) self.stack.addWidget(self.view)
self.cover = c = QLabel(_('Loading preview, please wait...'))
c.setWordWrap(True)
c.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
c.setStyleSheet('QLabel { background-color: palette(window); }')
c.setAlignment(Qt.AlignCenter)
self.stack.addWidget(self.cover)
self.stack.setCurrentIndex(self.stack.indexOf(self.cover))
self.bar = QToolBar(self) self.bar = QToolBar(self)
l.addWidget(self.bar) l.addWidget(self.bar)
@ -681,12 +690,13 @@ class Preview(QWidget):
actions['split-in-preview'].setChecked(False) actions['split-in-preview'].setChecked(False)
def load_started(self): def load_started(self):
pass self.stack.setCurrentIndex(self.stack.indexOf(self.cover))
def on_bridge_ready(self): def on_bridge_ready(self):
pass self.stack.setCurrentIndex(self.stack.indexOf(self.view))
def load_finished(self, ok): def load_finished(self, ok):
self.stack.setCurrentIndex(self.stack.indexOf(self.view))
if self.pending_go_to_anchor: if self.pending_go_to_anchor:
self.view._page.go_to_anchor(self.pending_go_to_anchor) self.view._page.go_to_anchor(self.pending_go_to_anchor)
self.pending_go_to_anchor = None self.pending_go_to_anchor = None