blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: append env 'scaleFactor' to deepin-wine application

Browse Source 
Signed-off-by: ComixHe <heyuming@deepin.org>
This commit is contained in:
ComixHe 2024-01-05 13:02:56 +08:00 committed by Comix
parent 810d5b996a
commit dd3d7342f9
2 changed files with 1 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/dbus/applicationservice.cpp
View File

@ -175,7 +175,7 @@ ApplicationService::Launch(const QString &action, const QStringList &fields, con
auto optionsMap = options; auto optionsMap = options;
QString oldEnv; QString oldEnv;
auto factor = getDeepinWineScaleFactor(m_desktopSource.desktopId()).toDouble(); auto factor = scaleFactor();
if (factor != 1.0) { if (factor != 1.0) {
if (auto it = optionsMap.find("env"); it != optionsMap.cend()) { if (auto it = optionsMap.find("env"); it != optionsMap.cend()) {
oldEnv = it->value<QString>(); oldEnv = it->value<QString>();
@ -1111,42 +1111,3 @@ double getScaleFactor() noexcept
scale = scale > 0 ? scale : 1; scale = scale > 0 ? scale : 1;
return scale; return scale;
} }
QString getDeepinWineScaleFactor(const QString &appId) noexcept
{
qCritical() << "Don't using env to control the window scale factor, this function"
"should via using graphic server(Wayland Compositor/Xorg Xft) in deepin wine.";
QString factor{"1.0"};
auto objectPath = QString{"/dde_launcher/org_deepin_dde_launcher/%1"}.arg(getCurrentUID());
auto systemBus = QDBusConnection::systemBus();
auto msg = QDBusMessage::createMethodCall(
"org.desktopspec.ConfigManager", objectPath, "org.desktopspec.ConfigManager.Manager", "value");
msg.setArguments({QString{"Apps_Disable_Scaling"}});
auto reply = systemBus.call(msg);
if (reply.type() != QDBusMessage::ReplyMessage) {
qWarning() << "get Apps_Disable_Scaling failed:" << reply.errorMessage();
return factor;
}
QDBusReply<QDBusVariant> ret{reply};
if (!ret.isValid()) {
qWarning() << "invalid reply:" << ret.error();
return factor;
}
QVariantList appList;
ret.value().variant().value<QDBusArgument>() >> appList;
for (const auto &val : appList) {
if (val.value<QString>() == appId) {
return factor;
}
}
auto scale = getScaleFactor();
factor = QString::number(scale, 'f', -1);
return factor;
}

1
src/dbus/applicationservice.h
View File

@ -24,7 +24,6 @@
#include <QUuid> #include <QUuid>
#include <memory> #include <memory>
QString getDeepinWineScaleFactor(const QString &appId) noexcept;
double getScaleFactor() noexcept; double getScaleFactor() noexcept;
struct AutostartSource struct AutostartSource