spark-store-project/spark-web-app-runtime
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-web-app-runtime.git synced 2025-12-15 03:22:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 支持启动时识别 DTK 主题颜色，判断网页是否需要显示为深色模式（切换 DTK 主题后重启生效，不支持实时生效）

Browse Source 
https://github.com/qutebrowser/qutebrowser/issues/4840
启动时判断 DTK 主题颜色，QTWEBENGINE_CHROMIUM_FLAGS 环境变量添加 --blink-settings=preferredColorScheme=0 启用深色模式（或 --force-dark-mode）（Qt >= 5.14，当前仅 Deepin 支持）

Log: 支持启动时识别 DTK 主题颜色，判断网页是否需要显示为深色模式
This commit is contained in:
zty199
2022-11-20 23:55:52 +08:00
parent c6b6734c9e
commit 6b25b50696
5 changed files with 125 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
spark-webapp-runtime/widget.cpp
View File

@@ -13,37 +13,8 @@ Widget::Widget(QString szUrl, QWidget *parent)
, mainLayout(new QStackedLayout(this))
, m_szUrl(szUrl)
{
m_spinner->setFixedSize(96, 96);
m_webEngineView->setObjectName(QStringLiteral("webEngineView"));
m_webEngineView->setEnabled(true);
m_webEngineView->setAutoFillBackground(false);
DApplication *dApp = qobject_cast<DApplication *>(qApp);
m_webEngineView->setZoomFactor(dApp->devicePixelRatio());
WebEnginePage *page = new WebEnginePage(m_webEngineView);
m_webEngineView->setPage(page);
page->setUrl(QUrl());
if (!m_szUrl.isEmpty()) {
page->setUrl(QUrl(m_szUrl));
}
QWidget *spinnerWidget = new QWidget(this);
QHBoxLayout *spinnerLayout = new QHBoxLayout(spinnerWidget);
spinnerLayout->setMargin(0);
spinnerLayout->setSpacing(0);
spinnerLayout->setAlignment(Qt::AlignCenter);
spinnerLayout->addStretch();
spinnerLayout->addWidget(m_spinner);
spinnerLayout->addStretch();
mainLayout->addWidget(spinnerWidget);
mainLayout->addWidget(m_webEngineView);
connect(m_webEngineView, &QWebEngineView::loadStarted, this, &Widget::on_loadStarted);
connect(m_webEngineView, &QWebEngineView::loadFinished, this, &Widget::on_loadFinished);
initUI();
initConnections();
}
Widget::~Widget()
@@ -70,6 +41,63 @@ void Widget::refresh()
m_webEngineView->reload();
}
void Widget::initUI()
{
m_spinner->setFixedSize(96, 96);
DApplication *dApp = qobject_cast<DApplication *>(qApp);
m_webEngineView->setZoomFactor(dApp->devicePixelRatio());
WebEnginePage *page = new WebEnginePage(m_webEngineView);
m_webEngineView->setPage(page);
page->setUrl(QUrl());
if (!m_szUrl.isEmpty()) {
page->setUrl(QUrl(m_szUrl));
}
QWidget *spinnerWidget = new QWidget(this);
QHBoxLayout *spinnerLayout = new QHBoxLayout(spinnerWidget);
spinnerLayout->setMargin(0);
spinnerLayout->setSpacing(0);
spinnerLayout->setAlignment(Qt::AlignCenter);
spinnerLayout->addStretch();
spinnerLayout->addWidget(m_spinner);
spinnerLayout->addStretch();
mainLayout->addWidget(spinnerWidget);
mainLayout->addWidget(m_webEngineView);
}
void Widget::initConnections()
{
connect(m_webEngineView, &QWebEngineView::loadStarted, this, &Widget::on_loadStarted, Qt::UniqueConnection);
connect(m_webEngineView, &QWebEngineView::loadFinished, this, &Widget::on_loadFinished, Qt::UniqueConnection);
// FIXME: DTK 主题切换时，动态修改 QtWebEngine prefers-color-scheme
// connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::paletteTypeChanged, this, &Widget::slotPaletteTypeChanged, Qt::UniqueConnection);
}
void Widget::updateLayout()
{
on_loadStarted();
mainLayout->removeWidget(m_webEngineView);
QUrl url = m_webEngineView->url();
m_webEngineView->deleteLater();
m_webEngineView = new WebEngineView(this);
mainLayout->addWidget(m_webEngineView);
initConnections();
DApplication *dApp = qobject_cast<DApplication *>(qApp);
m_webEngineView->setZoomFactor(dApp->devicePixelRatio());
WebEnginePage *page = new WebEnginePage(m_webEngineView);
m_webEngineView->setPage(page);
page->setUrl(url);
}
void Widget::on_loadStarted()
{
mainLayout->setCurrentIndex(0);
@@ -81,3 +109,13 @@ void Widget::on_loadFinished()
m_spinner->stop();
mainLayout->setCurrentIndex(1);
}
void Widget::slotPaletteTypeChanged(DGuiApplicationHelper::ColorType paletteType)
{
Q_UNUSED(paletteType)
WebEngineView::handleChromiumFlags();
if (m_webEngineView) {
updateLayout();
}
}