Skip to content

feat: adapt to treeland-region-watch-unstable-v1 protocol #1756

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
deepin-bot merged 1 commit into from
Oct 12, 2026
Merged

feat: adapt to treeland-region-watch-unstable-v1 protocol #1756

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ configure_file(environments.h.in environments.h @ONLY)
find_package(PkgConfig REQUIRED)
find_package(Qt${QT_VERSION_MAJOR} ${REQUIRED_QT_VERSION} COMPONENTS Core DBus Gui Qml WaylandCompositor Widgets WaylandClient)
find_package(DdeTrayLoader REQUIRED)
find_package(TreelandProtocols 0.6.0 REQUIRED)
find_package(TreelandProtocols 0.7.0 REQUIRED)
pkg_check_modules(WaylandClient REQUIRED IMPORTED_TARGET wayland-client)

file(
Expand Down Expand Up @@ -63,6 +63,7 @@ qt_generate_wayland_protocol_client_sources(dockpanel
${TREELAND_PROTOCOLS_DATA_DIR}/treeland-wallpaper-color-v1.xml
${TREELAND_PROTOCOLS_DATA_DIR}/treeland-dde-shell-v1.xml
${TREELAND_PROTOCOLS_DATA_DIR}/treeland-xwindow-control-unstable-v1.xml
${TREELAND_PROTOCOLS_DATA_DIR}/treeland-region-watch-unstable-v1.xml
)

target_link_libraries(dockpanel PRIVATE
Expand Down
75 changes: 44 additions & 31 deletions panels/dock/waylanddockhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@
#include "dockpanel.h"
#include "layershell/dlayershellwindow.h"
#include "qwayland-treeland-dde-shell-v1.h"
#include "qwayland-treeland-xwindow-control-unstable-v1.h"

Check warning on line 12 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "qwayland-treeland-xwindow-control-unstable-v1.h" not found.
#include "wayland-treeland-dde-shell-v1-client-protocol.h"

Check warning on line 13 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "wayland-treeland-dde-shell-v1-client-protocol.h" not found.
#include "wayland-treeland-xwindow-control-unstable-v1-client-protocol.h"

Check warning on line 14 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "wayland-treeland-xwindow-control-unstable-v1-client-protocol.h" not found.
#include "qwayland-treeland-region-watch-unstable-v1.h"

Check warning on line 15 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "qwayland-treeland-region-watch-unstable-v1.h" not found.
#include "wayland-treeland-region-watch-unstable-v1-client-protocol.h"

Check warning on line 16 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "wayland-treeland-region-watch-unstable-v1-client-protocol.h" not found.

#include <QtWaylandClient/private/qwaylandscreen_p.h>

Check warning on line 18 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtWaylandClient/private/qwaylandscreen_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QtWaylandClient/private/qwaylandsurface_p.h>

Check warning on line 19 in panels/dock/waylanddockhelper.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QtWaylandClient/private/qwaylandsurface_p.h> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QtWaylandClient/private/qwaylandwindow_p.h>

namespace dock {
Expand All @@ -26,6 +28,7 @@
{
m_ddeShellManager.reset(new TreeLandDDEShellManager());
m_xwindowControl.reset(new TreeLandXWindowControl());
m_regionWatchManager.reset(new TreeLandRegionWatchManager());
DS_NAMESPACE::DAppletBridge bridge("org.deepin.ds.dock.taskmanager");
if (auto applet = bridge.applet()) {
connect(applet, SIGNAL(windowFullscreenChanged(bool)), this, SLOT(setCurrentActiveWindowFullscreened(bool)));
Expand All @@ -40,33 +43,26 @@
}


connect(m_panel, &DockPanel::positionChanged, this, &WaylandDockHelper::updateOverlapCheckerPos);
connect(m_panel, &DockPanel::dockSizeChanged, this, &WaylandDockHelper::updateOverlapCheckerPos);
connect(m_panel, &DockPanel::rootObjectChanged, this, &WaylandDockHelper::updateOverlapCheckerPos);
connect(m_panel, &DockPanel::positionChanged, this, &WaylandDockHelper::updateRegionWatchPos);
connect(m_panel, &DockPanel::dockSizeChanged, this, &WaylandDockHelper::updateRegionWatchPos);
connect(m_panel, &DockPanel::rootObjectChanged, this, &WaylandDockHelper::updateRegionWatchPos);

@sourcery-ai sourcery-ai Bot Oct 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟠 High · Overlap tracking stops after screen changes

When the dock moves to another screen, including after its monitored output is removed, updateRegionWatchPos() is not called on dockScreenChanged, so set_region() keeps targeting the old output; output_removed() only clears overlap state, leaving SmartHide without updates on the new display.

Connect DockPanel::dockScreenChanged to updateRegionWatchPos().

Also at panels/dock/waylanddockhelper.cpp:291-294.

Prompt for AI agents 
In `panels/dock/waylanddockhelper.cpp` at line 48:

**Overlap tracking stops after screen changes**

When the dock moves to another screen, including after its monitored output is removed, `updateRegionWatchPos()` is not called on `dockScreenChanged`, so `set_region()` keeps targeting the old output; `output_removed()` only clears overlap state, leaving SmartHide without updates on the new display.

Connect `DockPanel::dockScreenChanged` to `updateRegionWatchPos()`.

Also at `panels/dock/waylanddockhelper.cpp:291-294`.


connect(m_ddeShellManager.get(), &TreeLandDDEShellManager::activeChanged, this, [this]() {
if (m_panel->hideMode() == HideMode::SmartHide && m_ddeShellManager->isActive()) {
m_overlapChecker.reset(new TreeLandWindowOverlapChecker(this, m_ddeShellManager->get_window_overlap_checker()));
updateOverlapCheckerPos();
auto ensureRegionWatch = [this]() {
if (m_panel->hideMode() == HideMode::SmartHide && m_regionWatchManager->isActive()) {
m_regionWatch.reset(new TreeLandRegionWatch(this, m_regionWatchManager->get_region_watch()));
updateRegionWatchPos();
} else {
m_overlapChecker.reset(nullptr);
m_regionWatch.reset(nullptr);
}
});

connect(m_panel, &DockPanel::hideModeChanged, this, [this](HideMode mode) {
if (mode == HideMode::SmartHide && m_ddeShellManager->isActive()) {
m_overlapChecker.reset(new TreeLandWindowOverlapChecker(this, m_ddeShellManager->get_window_overlap_checker()));
updateOverlapCheckerPos();
} else {
m_overlapChecker.reset(nullptr);
}
});
};
connect(m_regionWatchManager.get(), &TreeLandRegionWatchManager::activeChanged, this, ensureRegionWatch);
connect(m_panel, &DockPanel::hideModeChanged, this, ensureRegionWatch);

}

void WaylandDockHelper::updateOverlapCheckerPos()
void WaylandDockHelper::updateRegionWatchPos()
{
if (!m_overlapChecker)
if (!m_regionWatch)
return;

if (!m_panel->rootObject())
Expand All @@ -79,20 +75,20 @@
uint32_t anchor = 0;
switch (m_panel->position()) {
case Top:
anchor = QtWayland::treeland_window_overlap_checker::anchor_top;
anchor = QtWayland::treeland_region_watch_v1::anchor_top;
break;
case Bottom:
anchor = QtWayland::treeland_window_overlap_checker::anchor_bottom;
anchor = QtWayland::treeland_region_watch_v1::anchor_bottom;
break;
case Left:
anchor = QtWayland::treeland_window_overlap_checker::anchor_left;
anchor = QtWayland::treeland_region_watch_v1::anchor_left;
break;
case Right:
anchor = QtWayland::treeland_window_overlap_checker::anchor_right;
anchor = QtWayland::treeland_region_watch_v1::anchor_right;
break;
}

m_overlapChecker->update(m_panel->dockSize(), m_panel->dockSize(), anchor, waylandScreen->output());
m_regionWatch->set_region(m_panel->dockSize(), m_panel->dockSize(), anchor, waylandScreen->output());
}

DockWakeUpArea *WaylandDockHelper::createArea(QScreen *screen)
Expand Down Expand Up @@ -256,26 +252,43 @@
return QtWayland::treeland_xwindow_control_v1::set_xwindow_position_relative(wid, anchor, wl_fixed_from_double(dx), wl_fixed_from_double(dy));
}

TreeLandWindowOverlapChecker::TreeLandWindowOverlapChecker(WaylandDockHelper *helper, struct ::treeland_window_overlap_checker *checker)
: QWaylandClientExtensionTemplate<TreeLandWindowOverlapChecker>(treeland_dde_shell_manager_v1_interface.version)
TreeLandRegionWatchManager::TreeLandRegionWatchManager()
: QWaylandClientExtensionTemplate<TreeLandRegionWatchManager>(treeland_region_watch_manager_v1_interface.version)
{
}

TreeLandRegionWatchManager::~TreeLandRegionWatchManager()
{
if (isInitialized())
destroy();
}

TreeLandRegionWatch::TreeLandRegionWatch(WaylandDockHelper *helper, struct ::treeland_region_watch_v1 *watcher)
: QWaylandClientExtensionTemplate<TreeLandRegionWatch>(treeland_region_watch_v1_interface.version)
, m_helper(helper)
{
setParent(helper);
init(checker);
init(watcher);
}

TreeLandWindowOverlapChecker::~TreeLandWindowOverlapChecker()
TreeLandRegionWatch::~TreeLandRegionWatch()
{
destroy();
}

void TreeLandWindowOverlapChecker::treeland_window_overlap_checker_enter()
void TreeLandRegionWatch::treeland_region_watch_v1_enter()
{
m_helper->m_isWindowOverlap = true;
Q_EMIT m_helper->isWindowOverlapChanged(m_helper->m_isWindowOverlap);
}

void TreeLandWindowOverlapChecker::treeland_window_overlap_checker_leave()
void TreeLandRegionWatch::treeland_region_watch_v1_leave()
{
m_helper->m_isWindowOverlap = false;
Q_EMIT m_helper->isWindowOverlapChanged(m_helper->m_isWindowOverlap);
}

void TreeLandRegionWatch::treeland_region_watch_v1_output_removed()
{
m_helper->m_isWindowOverlap = false;
Q_EMIT m_helper->isWindowOverlapChanged(m_helper->m_isWindowOverlap);
Expand Down
31 changes: 22 additions & 9 deletions panels/dock/waylanddockhelper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
#include "dockhelper.h"
#include "dockpanel.h"

#include "qwayland-treeland-dde-shell-v1.h"

Check warning on line 10 in panels/dock/waylanddockhelper.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "qwayland-treeland-dde-shell-v1.h" not found.
#include "qwayland-treeland-wallpaper-color-v1.h"

Check warning on line 11 in panels/dock/waylanddockhelper.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "qwayland-treeland-wallpaper-color-v1.h" not found.
#include "qwayland-treeland-xwindow-control-unstable-v1.h"

Check warning on line 12 in panels/dock/waylanddockhelper.h

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: "qwayland-treeland-xwindow-control-unstable-v1.h" not found.
#include "qwayland-treeland-region-watch-unstable-v1.h"
#include <QWidget>

#include <QtWaylandClient/QWaylandClientExtension>
Expand All @@ -21,7 +22,8 @@
class TreeLandDockTriggerArea;
class TreeLandDDEShellManager;
class TreeLandXWindowControl;
class TreeLandWindowOverlapChecker;
class TreeLandRegionWatchManager;
class TreeLandRegionWatch;

class WaylandDockHelper : public DockHelper
{
Expand Down Expand Up @@ -52,16 +54,17 @@
void setCurrentActiveWindowFullscreened(bool);

private:
void updateOverlapCheckerPos();
void updateRegionWatchPos();
void initWallpaperColorManager();

private:
friend class TreeLandWindowOverlapChecker;
friend class TreeLandRegionWatch;
bool m_isWindowOverlap;
bool m_isCurrentActiveWindowFullscreened;
DockPanel *m_panel;
QScopedPointer<WallpaperColorManager> m_wallpaperColorManager;
QScopedPointer<TreeLandWindowOverlapChecker> m_overlapChecker;
QScopedPointer<TreeLandRegionWatch> m_regionWatch;
QScopedPointer<TreeLandRegionWatchManager> m_regionWatchManager;
QScopedPointer<TreeLandDDEShellManager> m_ddeShellManager;
QScopedPointer<TreeLandXWindowControl> m_xwindowControl;
struct ::wl_surface *m_dockWlSurface = nullptr; // Dock's wl_surface for XEmbed positioning
Expand Down Expand Up @@ -103,17 +106,27 @@
struct ::wl_callback *setXWindowPositionRelative(uint32_t wid, struct ::wl_surface *anchor, double dx, double dy);
};

class TreeLandWindowOverlapChecker : public QWaylandClientExtensionTemplate<TreeLandWindowOverlapChecker>, public QtWayland::treeland_window_overlap_checker
class TreeLandRegionWatchManager : public QWaylandClientExtensionTemplate<TreeLandRegionWatchManager>, public QtWayland::treeland_region_watch_manager_v1
{
Q_OBJECT

public:
TreeLandWindowOverlapChecker(WaylandDockHelper *helper, struct ::treeland_window_overlap_checker *);
~TreeLandWindowOverlapChecker();
explicit TreeLandRegionWatchManager();
~TreeLandRegionWatchManager() override;
};

class TreeLandRegionWatch : public QWaylandClientExtensionTemplate<TreeLandRegionWatch>, public QtWayland::treeland_region_watch_v1
{
Q_OBJECT

public:
TreeLandRegionWatch(WaylandDockHelper *helper, struct ::treeland_region_watch_v1 *);
~TreeLandRegionWatch();

protected:
void treeland_window_overlap_checker_enter() override;
void treeland_window_overlap_checker_leave() override;
void treeland_region_watch_v1_enter() override;
void treeland_region_watch_v1_leave() override;
void treeland_region_watch_v1_output_removed() override;

private:
WaylandDockHelper *m_helper;
Expand Down
Loading