YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2026-10-17 09:23:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] follow the selected device cursor in DeskHub

Browse Source
This commit is contained in:
dijunkun
2026-10-14 10:20:31 +08:00
parent 5721222724
commit 3043b5f110
6 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/src/gui/application/gui_application.cpp
+18 -1
View File
@@ -4395,6 +4395,8 @@ void GuiApplication::ReleaseControl() {
ReleasePressedInput();
gallery_group_control_id_.clear();
ui_->wall->set_gallery_group_controlling(false);
ui_->wall->set_gallery_remote_cursor_shape(
static_cast<int>(RemoteCursorShape::default_cursor));
if (!ui_->gallery_control_id.empty()) {
ui_->gallery_control_id.clear();
ui_->wall->set_gallery_controlling(false);
@@ -5148,12 +5150,27 @@ void GuiApplication::SyncGallery() {
ReleaseControl();
ui_->wall->set_gallery_fullscreen(fullscreen);
}
auto cursor_shape = RemoteCursorShape::default_cursor;
if (!ui_->gallery_control_id.empty()) {
// Only the selected control source owns the wall cursor, including group
// control. Followers can report different shapes without replacing it.
auto controlled = FindRemoteSession(ui_->gallery_control_id);
if (!visible || !controlled || controlled->closing_ ||
controlled->connection_status_ != ConnectionStatus::Connected)
controlled->connection_status_ != ConnectionStatus::Connected) {
ReleaseControl();
} else {
HostPlatform platform;
{
std::lock_guard lock(controlled->remote_version_mutex_);
platform = controlled->remote_platform_;
}
std::lock_guard lock(controlled->remote_cursor_state_mutex_);
if (controlled->remote_cursor_state_received_)
cursor_shape = controlled->cursor_presentation_.Resolve(
SDL_GetTicks(), platform);
}
}
ui_->wall->set_gallery_remote_cursor_shape(static_cast<int>(cursor_shape));
const auto now = std::chrono::steady_clock::now();
const auto action = transition.Advance(now, current_size.width, current_size.height,
window.scale_factor(), fullscreen, placement.Restoring());