Skip to content

fix some bugs #897

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
tsic404 merged 3 commits into from
Nov 21, 2024
Merged

fix some bugs #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83eba82
fix: mouse enter desktop make dock not hide
tsic404 Nov 21, 2024
4cb1e18
fix: dock not transparent on treeland
tsic404 Nov 21, 2024
b5972e2
chore: remove qt5 depends
tsic404 Nov 21, 2024
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
1 change: 0 additions & 1 deletion debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Build-Depends:
libqt6svg6,
libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, qt6-declarative-private-dev,
libyaml-cpp-dev,
qtbase5-dev, qtbase5-private-dev, qtwayland5-dev-tools, qtwayland5-private-dev, libdtkgui-dev, libdtkwidget-dev, libdtkcore5-bin,
qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (>= 0.0.11),
dde-application-manager-api (>= 1.2.16), dde-control-center-dev (>= 6.0.73)
Standards-Version: 3.9.8
Expand Down
4 changes: 0 additions & 4 deletions frame/qml/PanelPopupWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,6 @@ Window {
return appearance.opacity
}
blendColor: {
// TODO: when dtk support treeland blur, remove following
if (Qt.platform.pluginName === "wayland")
return "transparent"

if (valid) {
return DStyle.Style.control.selectColor(undefined,
Qt.rgba(235 / 255.0, 235 / 255.0, 235 / 255.0, blendColorAlpha(0.6)),
Expand Down
5 changes: 5 additions & 0 deletions panels/dock/dockhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ bool DockHelper::eventFilter(QObject *watched, QEvent *event)
return false;
}

// not dock panel or dock popup has a enter event
if (window != parent()->rootObject() && window->transientParent() != parent()->rootObject()) {
return false;
}

switch (event->type()) {
case QEvent::Enter: {
m_enters.insert(window, true);
Expand Down
Loading