Skip to content

refactor: move ShellSurfaceItemProxy to dock plugin level #1681

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
wjyrich merged 1 commit into from
Jul 30, 2026
Merged

refactor: move ShellSurfaceItemProxy to dock plugin level #1681

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
2 changes: 2 additions & 0 deletions panels/dock/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ ds_install_package(PACKAGE org.deepin.ds.dock TARGET dockpanel)
ds_handle_package_translation(PACKAGE org.deepin.ds.dock)

# sub plugins
#add_subdirectory(cardleft)
add_subdirectory(showdesktop)
add_subdirectory(taskmanager)
add_subdirectory(tray)
Expand Down Expand Up @@ -140,6 +141,7 @@ qt_add_qml_module(dock-plugin
SHARED
SOURCES ${plugin_sources}
QML_FILES DockCompositor.qml OverflowContainer.qml MenuHelper.qml DockPalette.qml
ShellSurfaceItemProxy.qml
AppletItemButton.qml
AppletItemBackground.qml
AppletDockItem.qml
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/ShellSurfaceItemProxy.qml → panels/dock/ShellSurfaceItemProxy.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Item {
property bool pressed: tapHandler.pressed
property int cursorShape: Qt.ArrowCursor
property alias shellSurfaceItem: impl

implicitWidth: shellSurface ? shellSurface.width : 16
implicitHeight: shellSurface ? shellSurface.height : 16

Expand Down
1 change: 0 additions & 1 deletion panels/dock/tray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ qt_add_qml_module(dock-tray
SurfacePopup.qml
SurfaceSubPopup.qml
TrayItemSurfacePopup.qml
ShellSurfaceItemProxy.qml

OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/plugins/org/deepin/ds/dock/tray/
)
Expand Down
2 changes: 1 addition & 1 deletion panels/dock/tray/package/ActionLegacyTrayPluginDelegate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ AppletItemButton {
parent: surfaceItem.shellSurfaceItem
}

DDT.ShellSurfaceItemProxy {
ShellSurfaceItemProxy {
id: surfaceItem
anchors.fill: parent
shellSurface: pluginItem.plugin
Expand Down
1 change: 1 addition & 0 deletions panels/dock/tray/quickpanel/DragItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import QtQuick.Window

import org.deepin.ds 1.0
import org.deepin.dtk 1.0
import org.deepin.ds.dock 1.0
import org.deepin.ds.dock.tray 1.0
import org.deepin.ds.dock.tray.quickpanel 1.0

Expand Down
3 changes: 2 additions & 1 deletion panels/dock/tray/quickpanel/PluginItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

import QtQuick
import QtQuick.Controls

import org.deepin.dtk 1.0
import org.deepin.ds.dock 1.0
import org.deepin.ds.dock.tray 1.0

Control {
Expand Down
3 changes: 2 additions & 1 deletion panels/dock/tray/quickpanel/SubPluginPage.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -7,6 +7,7 @@ import QtQuick.Controls
import QtQuick.Layouts

import org.deepin.dtk 1.0
import org.deepin.ds.dock 1.0
import org.deepin.ds.dock.tray 1.0

Item {
Expand Down
Loading