From 05b5f0e1dd165089847737685c8b54acce625061 Mon Sep 17 00:00:00 2001 From: carrot Date: Sun, 2 Aug 2026 11:48:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=87=8F=E5=B0=8F=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=A0=8F=E5=94=A4=E9=86=92=E5=8C=BA=E5=9F=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- panels/dock/waylanddockhelper.cpp | 8 ++++---- panels/dock/x11dockhelper.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/panels/dock/waylanddockhelper.cpp b/panels/dock/waylanddockhelper.cpp index 5b23bcf08..dd0a8ec02 100644 --- a/panels/dock/waylanddockhelper.cpp +++ b/panels/dock/waylanddockhelper.cpp @@ -273,7 +273,7 @@ TreeLandDockWakeUpArea::TreeLandDockWakeUpArea(QScreen *screen, WaylandDockHelpe // force create windowHandle for layershell. winId(); window()->setScreen(screen); - window()->resize(QSize(15, 15)); + window()->resize(QSize(1, 1)); setAttribute(Qt::WA_TranslucentBackground, true); auto window = ds::DLayerShellWindow::get(windowHandle()); @@ -315,7 +315,7 @@ void TreeLandDockWakeUpArea::updateDockWakeArea(Position pos) } } - window()->resize(QSize(15, 15)); + window()->resize(QSize(1, 1)); auto window = ds::DLayerShellWindow::get(windowHandle()); window->setAnchors(anchors); } @@ -337,9 +337,9 @@ void TreeLandDockWakeUpArea::resizeEvent(QResizeEvent *event) auto size = event->size(); if (m_pos == Left || m_pos == Right) { size.setHeight(m_screen->size().height()); - size.setWidth(15); + size.setWidth(1); } else { - size.setHeight(15); + size.setHeight(1); size.setWidth(m_screen->size().width()); } diff --git a/panels/dock/x11dockhelper.cpp b/panels/dock/x11dockhelper.cpp index 3ae6ce0aa..2f8bc233b 100644 --- a/panels/dock/x11dockhelper.cpp +++ b/panels/dock/x11dockhelper.cpp @@ -22,7 +22,7 @@ namespace dock { Q_LOGGING_CATEGORY(dockX11Log, "org.deepin.dde.shell.dock.x11") -const uint16_t monitorSize = 15; +const uint16_t monitorSize = 1; const uint32_t allWorkspace = 0xffffffff; // TODO: use taskmanager window data From af22cb666f1bcfb0490f059405ce273e8b0d337a Mon Sep 17 00:00:00 2001 From: carrot Date: Tue, 4 Aug 2026 00:51:18 +0800 Subject: [PATCH 2/2] 1 --- .github/workflows/deb-build.yml | 62 +++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 .github/workflows/deb-build.yml diff --git a/.github/workflows/deb-build.yml b/.github/workflows/deb-build.yml new file mode 100644 index 000000000..f371a0a42 --- /dev/null +++ b/.github/workflows/deb-build.yml @@ -0,0 +1,62 @@ +name: Build dde-shell deb packages + +on: + push: + workflow_dispatch: + pull_request: + +jobs: + container: + runs-on: ubuntu-latest + container: linuxdeepin/deepin:crimson + steps: + - uses: actions/checkout@v4 + + - name: Install build dependencies + run: | + set -euxo pipefail + + echo "deb [trusted=yes] http://mirrors.kernel.org/deepin/beige/ crimson main commercial community" > /etc/apt/sources.list + echo "deb-src [trusted=yes] http://mirrors.kernel.org/deepin/beige/ crimson main commercial community" >> /etc/apt/sources.list + rm -rf /etc/apt/sources.list.d + + apt-get update + apt-get install -y devscripts equivs git + + # Build and install treeland-protocols (required build dependency not from repo) + echo "Building treeland-protocols from source" + cd /tmp + if [ ! -d treeland-protocols ]; then + git clone --depth=1 --branch master --single-branch https://github.com/linuxdeepin/treeland-protocols.git + fi + cd treeland-protocols + mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control + dpkg-buildpackage -uc -us -b + apt-get install -y ../*.deb || dpkg -i ../*.deb || apt-get -f install -y + + cd "$GITHUB_WORKSPACE" + + # Install build-deps defined in dde-shell/debian/control + mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control + + - name: Build dde-shell deb packages + run: | + set -euxo pipefail + dpkg-buildpackage -uc -us -b + echo "dde-shell deb packages built successfully!" + ls -la ../ + + - name: Collect deb artifacts + run: | + set -euxo pipefail + mkdir -p dist + mv ../*.deb dist/ + ls -la dist + + - name: Upload deb packages as artifacts + uses: actions/upload-artifact@v4 + with: + name: dde-shell-deb-packages + path: dist/*.deb + if-no-files-found: error + retention-days: 30