fix: initialize WebEngine before showing window
This commit is contained in:
@@ -139,6 +139,7 @@ def main(argv: list[str] | None = None) -> int:
|
||||
prompt_for_project=project_root is None,
|
||||
defer_startup=True,
|
||||
)
|
||||
window.prepare_reader_before_show()
|
||||
window.show()
|
||||
logging.getLogger(__name__).info("Main window shown in %.3f s (after imports)", time.perf_counter() - startup_started)
|
||||
|
||||
|
||||
+40
-10
@@ -15,7 +15,7 @@ from email.policy import default as email_default_policy
|
||||
from pathlib import Path
|
||||
from urllib.parse import unquote, urlsplit
|
||||
|
||||
from PySide6.QtCore import QFile, QFileSystemWatcher, QObject, QPoint, QProcess, QSettings, QSignalBlocker, QSize, QThreadPool, QTimer, QUrl, Qt, Signal, Slot
|
||||
from PySide6.QtCore import QEventLoop, QFile, QFileSystemWatcher, QObject, QPoint, QProcess, QSettings, QSignalBlocker, QSize, QThreadPool, QTimer, QUrl, Qt, Signal, Slot
|
||||
from PySide6.QtGui import (
|
||||
QAction,
|
||||
QActionGroup,
|
||||
@@ -105,7 +105,6 @@ EXTERNAL_APPLICATIONS_SETTING_KEY = "external_apps/by_extension"
|
||||
EDITOR_DRAFTS_SETTING_KEY = "editor/drafts"
|
||||
LAST_PROJECT_ROOT_SETTING_KEY = "project/last_root"
|
||||
DIRECTORY_POLL_INTERVAL_MS = 1000
|
||||
READER_PREWARM_DELAY_MS = 350
|
||||
CUSTOM_DOCUMENT_STYLES_SETTING_KEY = "reader/custom_document_styles"
|
||||
LOGGER = logging.getLogger(__name__)
|
||||
THEME_COLOR_VALUES = {"white", "black", "dark_gray", "colorful"}
|
||||
@@ -556,6 +555,7 @@ class MainWindow(QMainWindow):
|
||||
self.has_project = project_root is not None
|
||||
self._startup_generation = 0
|
||||
self._startup_scan_pending = defer_startup and self.has_project
|
||||
self._deferred_startup_pending = defer_startup
|
||||
self._startup_initial_path = initial_path
|
||||
self._startup_prompt = prompt_for_project
|
||||
self.settings = QSettings("MDHelper", "MDHelper")
|
||||
@@ -625,10 +625,6 @@ class MainWindow(QMainWindow):
|
||||
self.scroll_capture_timer.setInterval(1500)
|
||||
self.scroll_capture_timer.timeout.connect(self._save_current_scroll_position)
|
||||
|
||||
self.reader_prewarm_timer = QTimer(self)
|
||||
self.reader_prewarm_timer.setSingleShot(True)
|
||||
self.reader_prewarm_timer.setInterval(READER_PREWARM_DELAY_MS)
|
||||
self.reader_prewarm_timer.timeout.connect(self._prewarm_reader_view)
|
||||
self._standby_reader_view: ReaderView | None = None
|
||||
self._standby_reader_host: ReaderTabHost | None = None
|
||||
|
||||
@@ -657,7 +653,6 @@ class MainWindow(QMainWindow):
|
||||
if defer_startup:
|
||||
if self.has_project:
|
||||
self.status_label.setText(f"正在加载目录:{self.project_root}")
|
||||
QTimer.singleShot(0, self._finish_startup)
|
||||
else:
|
||||
self._open_startup_document(initial_path, prompt_for_project)
|
||||
|
||||
@@ -1226,6 +1221,7 @@ class MainWindow(QMainWindow):
|
||||
started = time.perf_counter()
|
||||
web_view = self._create_reader_view()
|
||||
web_view.setProperty("is_reader_standby", True)
|
||||
web_view.setProperty("reader_prewarm_ready", False)
|
||||
host.set_reader_view(web_view)
|
||||
self._standby_reader_view = web_view
|
||||
|
||||
@@ -1234,12 +1230,46 @@ class MainWindow(QMainWindow):
|
||||
web_view.loadFinished.disconnect(prewarm_finished)
|
||||
except (RuntimeError, TypeError):
|
||||
pass
|
||||
if ok:
|
||||
web_view.setProperty("reader_prewarm_ready", True)
|
||||
LOGGER.info("Reader prewarm finished in %.3f s (ok=%s)", time.perf_counter() - started, ok)
|
||||
|
||||
web_view.loadFinished.connect(prewarm_finished)
|
||||
web_view.setHtml("<!doctype html><html><body></body></html>", QUrl("about:blank"))
|
||||
LOGGER.debug("Reader prewarm requested")
|
||||
|
||||
def prepare_reader_before_show(self, timeout_ms: int = 8000) -> None:
|
||||
if self.isVisible():
|
||||
return
|
||||
self._prewarm_reader_view()
|
||||
web_view = self._standby_reader_view
|
||||
if web_view is None or bool(web_view.property("reader_prewarm_ready")):
|
||||
return
|
||||
|
||||
wait_loop = QEventLoop(self)
|
||||
timeout_timer = QTimer(self)
|
||||
timeout_timer.setSingleShot(True)
|
||||
timeout_timer.timeout.connect(wait_loop.quit)
|
||||
|
||||
def finish_wait(ok: bool) -> None:
|
||||
if ok:
|
||||
wait_loop.quit()
|
||||
|
||||
web_view.loadFinished.connect(finish_wait)
|
||||
started = time.perf_counter()
|
||||
timeout_timer.start(max(1, int(timeout_ms)))
|
||||
wait_loop.exec()
|
||||
timeout_timer.stop()
|
||||
try:
|
||||
web_view.loadFinished.disconnect(finish_wait)
|
||||
except (RuntimeError, TypeError):
|
||||
pass
|
||||
LOGGER.info(
|
||||
"Reader pre-show preparation waited %.3f s (ready=%s)",
|
||||
time.perf_counter() - started,
|
||||
bool(web_view.property("reader_prewarm_ready")),
|
||||
)
|
||||
|
||||
def _release_tab_widget(self, widget: QWidget | None) -> None:
|
||||
if widget is None:
|
||||
return
|
||||
@@ -5614,7 +5644,6 @@ class MainWindow(QMainWindow):
|
||||
def closeEvent(self, event: QCloseEvent) -> None:
|
||||
self._startup_generation += 1
|
||||
self._startup_scan_pending = False
|
||||
self.reader_prewarm_timer.stop()
|
||||
standby_host = self._standby_reader_host
|
||||
self._standby_reader_host = None
|
||||
self._standby_reader_view = None
|
||||
@@ -5631,6 +5660,7 @@ class MainWindow(QMainWindow):
|
||||
def showEvent(self, event: QShowEvent) -> None:
|
||||
super().showEvent(event)
|
||||
QTimer.singleShot(0, self._apply_navigation_style)
|
||||
if not self.reader_prewarm_timer.isActive() and self._standby_reader_view is None:
|
||||
self.reader_prewarm_timer.start()
|
||||
if self._deferred_startup_pending:
|
||||
self._deferred_startup_pending = False
|
||||
QTimer.singleShot(0, self._finish_startup)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user