Skip to content

fix: isolate smart-hide state per workspace in X11 dock helper #1754

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

Open
wjyrich wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: isolate smart-hide state per workspace in X11 dock helper #1754

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
25 changes: 8 additions & 17 deletions panels/dock/x11dockhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,20 +374,7 @@ void X11DockHelper::onHideModeChanged(HideMode mode)
connect(m_xcbHelper, &XcbEventFilter::windowPropertyChanged, this, &X11DockHelper::onWindowPropertyChanged);
connect(m_xcbHelper, &XcbEventFilter::windowGeometryChanged, this, &X11DockHelper::onWindowGeometryChanged);
connect(m_xcbHelper, &XcbEventFilter::currentWorkspaceChanged, this, [this]() {
static bool updating = false;
if (updating)
return;

updating = true;
int currentWorkspace = m_xcbHelper->getCurrentWorkspace();
for (auto &&data : m_windows) {
if (data->overlap && (static_cast<int>(data->workspace) == currentWorkspace || data->workspace == static_cast<uint32_t>(allWorkspace))) {
Q_EMIT isWindowOverlapChanged(isWindowOverlap());
updating = false;
return;
}
}
updating = false;
Q_EMIT isWindowOverlapChanged(isWindowOverlap());
});
} break;
case KeepShowing:
Expand Down Expand Up @@ -455,6 +442,7 @@ void X11DockHelper::onWindowWorkspaceChanged(xcb_window_t window)
{
if (m_windows.contains(window)) {
m_windows[window]->workspace = m_xcbHelper->getWindowWorkspace(window);
Q_EMIT isWindowOverlapChanged(isWindowOverlap());
}
}

Expand Down Expand Up @@ -535,10 +523,13 @@ bool X11DockHelper::isWindowOverlap()
return false;
}

// any widnow overlap
// any window overlap in current workspace
uint32_t currentWorkspace = m_xcbHelper->getCurrentWorkspace();
bool overlap = false;
std::for_each(m_windows.begin(), m_windows.end(), [&overlap](const auto &window) {
return overlap |= window->overlap;
std::for_each(m_windows.begin(), m_windows.end(), [&overlap, currentWorkspace](const auto &window) {
if (window->overlap && (window->workspace == currentWorkspace || window->workspace == allWorkspace)) {
overlap = true;
}
});
return overlap;
}
Expand Down
Loading