Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
62 changes: 62 additions & 0 deletions .github/workflows/deb-build.yml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions panels/dock/waylanddockhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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);
}
Expand All @@ -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());
}

Expand Down
2 changes: 1 addition & 1 deletion panels/dock/x11dockhelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading