Skip to content

fix: skip scale factor retrieval on Wayland temporarily #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mhduiy merged 1 commit into from
Jan 26, 2026
Merged

fix: skip scale factor retrieval on Wayland temporarily #186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/dde-session/environmentsmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,21 @@ void EnvironmentsManager::init()

void EnvironmentsManager::createGeneralEnvironments()
{
QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
double scaleFactor = 1.0;
QDBusInterface dbusInterface("org.deepin.dde.XSettings1", "/org/deepin/dde/XSettings1",

if (sessionType == "x11") {
QDBusInterface dbusInterface("org.deepin.dde.XSettings1", "/org/deepin/dde/XSettings1",
"org.deepin.dde.XSettings1", QDBusConnection::sessionBus());
if (dbusInterface.isValid()) {
QDBusReply<double> scaleFactorReply = dbusInterface.call("GetScaleFactor");
if (scaleFactorReply.isValid()) {
scaleFactor = scaleFactorReply.value();
if (dbusInterface.isValid()) {
QDBusReply<double> scaleFactorReply = dbusInterface.call("GetScaleFactor");
if (scaleFactorReply.isValid()) {
scaleFactor = scaleFactorReply.value();
}
}
} else {
// TODO: wayland环境下在这里通过xsettings获取是不合理的，此时xsettings服务还没有启动，并且也无法启动（没有DISPLAY，xwayland此时没有启动）
// 且 wayland 此时也无法连接，无法通过协议获取，后续考虑其他方式获取，这里仅影响双击时两次点击坐标的冗余量的设置
}

auto envs = QProcessEnvironment::systemEnvironment();
Expand All @@ -94,7 +101,6 @@ void EnvironmentsManager::createGeneralEnvironments()
m_envMap.insert("XDG_CURRENT_DESKTOP", "DDE");
m_envMap.insert("QT_DBL_CLICK_DIST", QString::number(15 * scaleFactor));

QByteArray sessionType = qgetenv("XDG_SESSION_TYPE");
if (sessionType == "x11") {
m_envMap.insert("QT_QPA_PLATFORM", "dxcb;xcb");
} else if (sessionType == "wayland") {
Expand Down