fix: popup scaling incorrectly

tsic404 · deepin-bot[bot] · commit f691bcdc2a3b · 2024-12-06T06:55:09.000Z
Set plugin scaling via fractional scaling protocol instead of
QT environment variables

log: as title
diff --git a/debian/control b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
  libqt6svg6,
  libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, qt6-declarative-private-dev,
  libyaml-cpp-dev,
- qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (>= 1.99.5),
+ qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (> 1.99.6),
  dde-application-manager-api (>= 1.2.16), dde-control-center-dev (>= 6.0.73)
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org
diff --git a/panels/dock/CMakeLists.txt b/panels/dock/CMakeLists.txt
@@ -148,6 +148,7 @@ qt_add_qml_module(dock-plugin
 qt_generate_wayland_protocol_server_sources(dock-plugin
     FILES
         ${DDE_TRAY_LOADER_PROTOCOL}
+        ${WaylandProtocols_DATADIR}/staging/fractional-scale/fractional-scale-v1.xml
 )
 
 target_link_libraries(dock-plugin PUBLIC
diff --git a/panels/dock/DockCompositor.qml b/panels/dock/DockCompositor.qml
@@ -24,6 +24,7 @@ Item {
     property ListModel fixedPluginSurfaces: ListModel {}
 
     property var compositor: waylandCompositor
+    property var panelScale: 1.0
 
     signal pluginSurfacesUpdated()
     signal popupCreated(var popup)
@@ -107,5 +108,10 @@ Item {
                 dockCompositor.requestShutdown()
             }
         }
+
+        PluginScaleManager{
+            id: pluginScaleManager
+            pluginScale: dockCompositor.panelScale * 120
+        }
     }
 }
diff --git a/panels/dock/dockpanel.cpp b/panels/dock/dockpanel.cpp
@@ -137,6 +137,8 @@ bool DockPanel::init()
             else {
                 m_dockScreen = window()->screen();
             }
+            rootObject()->installEventFilter(this);
+            Q_EMIT devicePixelRatioChanged(window()->devicePixelRatio());
         }
     });
 
@@ -391,6 +393,22 @@ QString DockPanel::screenName() const
         return {};
     return m_dockScreen->name();
 }
+
+qreal DockPanel::devicePixelRatio() const
+{
+    if (!window())
+        return 1.0;
+    return window()->devicePixelRatio();
+}
+
+bool DockPanel::eventFilter(QObject *watched, QEvent *event)
+{
+    if (watched == window() && event->type() == QEvent::DevicePixelRatioChange) {
+        Q_EMIT devicePixelRatioChanged(window()->devicePixelRatio());
+    }
+
+    return false;
+}
 }
 
 #include "dockpanel.moc"
diff --git a/panels/dock/dockpanel.h b/panels/dock/dockpanel.h
@@ -33,6 +33,8 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
     Q_PROPERTY(bool showInPrimary READ showInPrimary WRITE setShowInPrimary NOTIFY showInPrimaryChanged FINAL)
     Q_PROPERTY(QString screenName READ screenName NOTIFY screenNameChanged FINAL)
 
+    Q_PROPERTY(qreal devicePixelRatio READ devicePixelRatio NOTIFY devicePixelRatioChanged FINAL)
+
     Q_PROPERTY(bool debugMode READ debugMode FINAL CONSTANT)
 
 public:
@@ -82,6 +84,11 @@ class DockPanel : public DS_NAMESPACE::DPanel, public QDBusContext
     void setDockScreen(QScreen *screen);
     QString screenName() const;
 
+    qreal devicePixelRatio() const;
+
+protected:
+    bool eventFilter(QObject *watched, QEvent *event) override;
+
 private Q_SLOTS:
     void onWindowGeometryChanged();
     void launcherVisibleChanged(bool visible);
@@ -103,6 +110,7 @@ private Q_SLOTS:
     void dockScreenChanged(QScreen *screen);
     void screenNameChanged();
     void requestClosePopup();
+    void devicePixelRatioChanged(qreal ratio);
 
 private:
     ColorTheme m_theme;
diff --git a/panels/dock/loadtrayplugins.cpp b/panels/dock/loadtrayplugins.cpp
@@ -118,9 +118,6 @@ void LoadTrayPlugins::setProcessEnv(QProcess *process)
     if (!process) return;
 
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-    env.insert("QT_SCALE_FACTOR", QString::number(qApp->devicePixelRatio()));
-    env.insert("D_DXCB_DISABLE_OVERRIDE_HIDPI", "1");
-
     // TODO: use protocols to determine the environment instead of environment variables
     env.remove("DDE_CURRENT_COMPOSITOR");
 
diff --git a/panels/dock/package/main.qml b/panels/dock/package/main.qml
@@ -552,6 +552,10 @@ Window {
             return Qt.size(Panel.frontendWindowRect.width, Panel.frontendWindowRect.height)
         })
 
+        DockCompositor.panelScale = Qt.binding(function(){
+            return Panel.devicePixelRatio
+        })
+
         dock.itemIconSizeBase = dock.dockItemMaxSize
         dock.visible = Panel.hideState !== Dock.Hide
         changeDragAreaAnchor()
diff --git a/panels/dock/pluginmanagerextension.cpp b/panels/dock/pluginmanagerextension.cpp
@@ -15,6 +15,74 @@
 #include <QJsonObject>
 #include <QJsonParseError>
 
+PluginScaleManager::PluginScaleManager(QWaylandCompositor *compositor)
+    : QWaylandCompositorExtensionTemplate(compositor)
+    , m_compositor(compositor)
+{
+}
+
+void PluginScaleManager::setPluginScale(const uint32_t &scale)
+{
+    if (scale == m_scale)
+        return;
+    m_scale = scale;
+    if (!m_compositor)
+        return;
+
+    auto outputs = m_compositor->outputs();
+    std::for_each(outputs.begin(), outputs.end(), [this](auto *output) {
+        // 120 is base of fractional scale.
+        output->setScaleFactor(std::ceil(m_scale / 120));
+    });
+
+    Q_EMIT pluginScaleChanged(m_scale);
+}
+
+uint32_t PluginScaleManager::pluginScale()
+{
+    return m_scale;
+}
+
+void PluginScaleManager::initialize()
+{
+    QWaylandCompositorExtensionTemplate::initialize();
+    QWaylandCompositor *compositor = static_cast<QWaylandCompositor *>(extensionContainer());
+    Q_ASSERT(compositor);
+
+    init(compositor->display(), 1);
+    m_compositor = compositor;
+    connect(compositor, &QWaylandCompositor::outputAdded, this, [this](auto *output) {
+        output->setScaleFactor(std::ceil(m_scale / 120));
+    });
+}
+
+void PluginScaleManager::wp_fractional_scale_manager_v1_get_fractional_scale(Resource *resource, uint32_t id, struct ::wl_resource *surface)
+{
+    QWaylandSurface *qwaylandSurface = QWaylandSurface::fromResource(surface);
+    QWaylandResource shellSurfaceResource(
+        wl_resource_create(resource->client(), &::wp_fractional_scale_v1_interface, wl_resource_get_version(resource->handle), id));
+    auto pluginScale = new PluginScale(this, qwaylandSurface, shellSurfaceResource);
+    pluginScale->send_preferred_scale(m_scale);
+}
+
+PluginScale::PluginScale(PluginScaleManager *manager, QWaylandSurface *surface, const QWaylandResource &resource)
+{
+    setParent(manager);
+    init(resource.resource());
+    setExtensionContainer(surface);
+    QWaylandCompositorExtension::initialize();
+
+    connect(manager, &PluginScaleManager::pluginScaleChanged, this, [this](uint32_t scale) {
+        send_preferred_scale(scale);
+    });
+}
+
+void PluginScale::wp_fractional_scale_v1_destroy(Resource *resource)
+{
+    Q_UNUSED(resource)
+    deleteLater();
+}
+
 PluginSurface::PluginSurface(PluginManager* manager, const QString& pluginId, const QString& itemKey, const QString &displayName, int pluginFlags, int pluginType, int sizePolicy, QWaylandSurface *surface, const QWaylandResource &resource)
     : m_manager(manager)
     , m_surface(surface)
@@ -29,8 +97,6 @@ PluginSurface::PluginSurface(PluginManager* manager, const QString& pluginId, co
     init(resource.resource());
     setExtensionContainer(surface);
     QWaylandCompositorExtension::initialize();
-
-    connect(surface, &QWaylandSurface::bufferSizeChanged, this, &PluginSurface::sizeChanged);
 }
 
 QWaylandQuickShellIntegration* PluginSurface::createIntegration(QWaylandQuickShellSurfaceItem *item)
@@ -73,9 +139,14 @@ uint32_t PluginSurface::pluginSizePolicy () const
     return m_sizePolicy;
 }
 
-QSize PluginSurface::pluginSize() const
+int PluginSurface::height() const
 {
-    return m_surface->bufferSize() / qApp->devicePixelRatio();
+    return m_height;
+}
+
+int PluginSurface::width() const
+{
+    return m_width;
 }
 
 QString PluginSurface::dccIcon() const
@@ -151,6 +222,23 @@ void PluginSurface::setGlobalPos(const QPoint &pos)
     send_raw_global_pos(p.x(), p.y());
 }
 
+void PluginSurface::plugin_source_size(Resource *resource, int32_t width, int32_t height)
+{
+    Q_UNUSED(resource);
+    if (width == 0 || height == 0)
+        return;
+
+    if (height != m_height) {
+        m_height = height;
+        Q_EMIT heightChanged();
+    }
+
+    if (width != m_width) {
+        m_width = width;
+        Q_EMIT widthChanged();
+    }
+}
+
 PluginPopup::PluginPopup(PluginManager* manager, const QString &pluginId, const QString &itemKey, int x, int y, int popupType, QWaylandSurface *surface, const QWaylandResource &resource)
     : m_manager(manager)
     , m_surface(surface)
@@ -215,6 +303,16 @@ void PluginPopup::setY(int32_t y)
     Q_EMIT yChanged();
 }
 
+int PluginPopup::height() const
+{
+    return m_height;
+}
+
+int PluginPopup::width() const
+{
+    return m_width;
+}
+
 int32_t PluginPopup::popupType() const
 {
     return m_popupType;
@@ -238,6 +336,24 @@ void PluginPopup::plugin_popup_destroy(Resource *resource)
 {
     wl_resource_destroy(resource->handle);
 }
+
+void PluginPopup::plugin_popup_source_size(Resource *resource, int32_t width, int32_t height)
+{
+    Q_UNUSED(resource);
+    if (width == 0 || height == 0)
+        return;
+
+    if (height != m_height) {
+        m_height = height;
+        Q_EMIT heightChanged();
+    }
+
+    if (width != m_width) {
+        m_width = width;
+        Q_EMIT widthChanged();
+    }
+}
+
 PluginManager::PluginManager(QWaylandCompositor *compositor)
     : QWaylandCompositorExtensionTemplate(compositor)
 {
diff --git a/panels/dock/pluginmanagerextension_p.h b/panels/dock/pluginmanagerextension_p.h
diff --git a/panels/dock/tray/ShellSurfaceItemProxy.qml b/panels/dock/tray/ShellSurfaceItemProxy.qml
diff --git a/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml b/panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ qt_add_qml_module(dock-plugin`
`148`	`148`	`qt_generate_wayland_protocol_server_sources(dock-plugin`
`149`	`149`	`FILES`
`150`	`150`	`${DDE_TRAY_LOADER_PROTOCOL}`
	`151`	`+ ${WaylandProtocols_DATADIR}/staging/fractional-scale/fractional-scale-v1.xml`
`151`	`152`	`)`
`152`	`153`
`153`	`154`	`target_link_libraries(dock-plugin PUBLIC`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ Item {`
`24`	`24`	`property ListModel fixedPluginSurfaces: ListModel {}`
`25`	`25`
`26`	`26`	`property var compositor: waylandCompositor`
	`27`	`+ property var panelScale: 1.0`
`27`	`28`
`28`	`29`	`signal pluginSurfacesUpdated()`
`29`	`30`	`signal popupCreated(var popup)`
`@@ -107,5 +108,10 @@ Item {`
`107`	`108`	`dockCompositor.requestShutdown()`
`108`	`109`	`}`
`109`	`110`	`}`
	`111`	`+`
	`112`	`+ PluginScaleManager{`
	`113`	`+ id: pluginScaleManager`
	`114`	`+ pluginScale: dockCompositor.panelScale * 120`
	`115`	`+ }`
`110`	`116`	`}`
`111`	`117`	`}`