fix: initialize WebEngine before showing window

This commit is contained in:
2026-09-21 23:07:13 +08:00
parent a589e1df19
commit 1b4e974b77
6 changed files with 48 additions and 17 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ MDHelper/
当前阅读模式中,正文在 `QWebEngineView` 内滚动。左侧 `QTabWidget` 在文件目录与当前文档大纲间切换;大纲仅在点击时跳转,不随滚动选中标题。状态栏不显示阅读进度。
主窗口首先显示固定阅读容器中的轻量 Qt 欢迎页,随后由单次定时器在同一容器内创建并加载隐藏的 `QWebEngineView`。首次打开文档时,标签页对象、容器和 WebEngine 父子关系均保持不变;文档加载完成后只切换容器内部页面,避免 Windows 原生子窗口重建造成闪烁。关闭全部阅读标签后会保留一个隐藏阅读容器,避免同一进程内再次承担 Chromium 冷启动成本。
程序在主窗口显示前,在固定阅读容器中创建 `QWebEngineView` 并等待空白页加载完成;这一阶段允许增加启动耗时,但不会让用户看到 Chromium 初始化造成的界面重绘。随后主窗口一次性显示轻量 Qt 欢迎页。首次打开文档时,标签页对象、容器和 WebEngine 父子关系均保持不变;文档加载完成后只切换容器内部页面。关闭全部阅读标签后会保留一个隐藏阅读容器,避免同一进程内再次承担 Chromium 冷启动成本。
## 6. 当前渲染流程
+1 -1
View File
@@ -131,7 +131,7 @@ MDHelper 是一个本地 Markdown / 代码文档阅读器,使用 PySide6 构
## 启动优化
- 使用目录式程序和安装包,Qt、Pandoc 等资源只在安装时解压一次。
- 欢迎页和阅读器共用固定标签容器;主窗口显示后在欢迎页背后预热常驻浏览器,首次打开文档只切换容器内部页面,不重建或重新挂接 Windows 原生控件。
- 欢迎页和阅读器共用固定标签容器;程序在显示主窗口前完成常驻浏览器初始化,随后一次性显示完整界面。首次打开文档只切换容器内部页面,不重建或重新挂接 Windows 原生控件。
- 关闭全部文档后保留一个隐藏阅读器供后续复用;Windows 渲染后端由 Qt WebEngine 自动选择。
- 先显示主窗口,后台扫描初始目录;去掉读取设置前的重复扫描和打开初始文件时的重复扫描。
- 普通文档不加载公式、图表运行库;公式与图表按页面内容分别加载。
+1
View File
@@ -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
View File
@@ -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)
+4 -5
View File
@@ -43,19 +43,18 @@ def main() -> int:
settings.setValue("reader/document_file_groups", '["markdown"]')
settings.setValue("reader/wheel_scroll_speed", 1.0)
window = MainWindow(project_root=project_root, initial_path=project_root / "sample.md", defer_startup=True)
window.prepare_reader_before_show()
window.show()
checks: list[str] = []
def verify() -> None:
empty_window = MainWindow(project_root=None, app_root=project_root)
empty_window.show()
prewarm_loop = QEventLoop()
QTimer.singleShot(900, prewarm_loop.quit)
prewarm_loop.exec()
empty_window.prepare_reader_before_show()
fixed_reader_host = empty_window.tabs.currentWidget()
empty_window.show()
if not isinstance(fixed_reader_host, ReaderTabHost) or fixed_reader_host.reader_view is None:
checks.append("reader_background_prewarm")
checks.append("reader_pre_show_preparation")
if empty_window.has_project or empty_window.entries:
checks.append("empty_start_project")
if empty_window.new_file_action.isEnabled():
+1
View File
@@ -126,6 +126,7 @@ def test_switching_projects_discards_old_scan(gui, tmp_path, monkeypatch):
monkeypatch.setattr(startup_scan, "discover_documents", slow_scan)
window = main_window.MainWindow(old_root, defer_startup=True)
try:
window.show()
wait_until(gui, entered.is_set)
window.set_project_root(new_root, save=False)
release.set()