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

[fix] fix mouse wheel and touchpad swipe commands, refs #9, #23

Browse Source
This commit is contained in:
dijunkun
2025-11-20 22:59:54 +08:00
parent dd482cee60
commit 5d0a4d1385
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/gui/render_callback.cpp
View File

@@ -1,3 +1,5 @@
#include <cmath>
#include "device_controller.h" #include "device_controller.h"
#include "localization.h" #include "localization.h"
#include "platform.h" #include "platform.h"
@@ -101,28 +103,39 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
last_mouse_event.button.y >= props->stream_render_rect_.y && last_mouse_event.button.y >= props->stream_render_rect_.y &&
last_mouse_event.button.y <= props->stream_render_rect_.y + last_mouse_event.button.y <= props->stream_render_rect_.y +
props->stream_render_rect_.h) { props->stream_render_rect_.h) {
int scroll_x = event.wheel.x; float scroll_x = event.wheel.x;
int scroll_y = event.wheel.y; float scroll_y = event.wheel.y;
if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) { if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
scroll_x = -scroll_x; scroll_x = -scroll_x;
scroll_y = -scroll_y; scroll_y = -scroll_y;
} }
remote_action.type = ControlType::mouse; remote_action.type = ControlType::mouse;
if (scroll_x == 0) {
auto roundUp = [](float value) -> int {
if (value > 0) {
return static_cast<int>(std::ceil(value));
} else if (value < 0) {
return static_cast<int>(std::floor(value));
}
return 0;
};
if (std::abs(scroll_y) >= std::abs(scroll_x)) {
remote_action.m.flag = MouseFlag::wheel_vertical; remote_action.m.flag = MouseFlag::wheel_vertical;
remote_action.m.s = scroll_y; remote_action.m.s = roundUp(scroll_y);
} else if (scroll_y == 0) { } else {
remote_action.m.flag = MouseFlag::wheel_horizontal; remote_action.m.flag = MouseFlag::wheel_horizontal;
remote_action.m.s = scroll_x; remote_action.m.s = roundUp(scroll_x);
} }
render_width = props->stream_render_rect_.w; render_width = props->stream_render_rect_.w;
render_height = props->stream_render_rect_.h; render_height = props->stream_render_rect_.h;
remote_action.m.x = remote_action.m.x =
(float)(event.button.x - props->stream_render_rect_.x) / render_width; (float)(last_mouse_event.button.x - props->stream_render_rect_.x) /
render_width;
remote_action.m.y = remote_action.m.y =
(float)(event.button.y - props->stream_render_rect_.y) / (float)(last_mouse_event.button.y - props->stream_render_rect_.y) /
render_height; render_height;
std::string msg = remote_action.to_json(); std::string msg = remote_action.to_json();
@@ -225,8 +238,6 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
props->video_height_ = video_frame->height; props->video_height_ = video_frame->height;
props->video_size_ = video_frame->size; props->video_size_ = video_frame->size;
LOG_ERROR("receive: {}x{}", props->video_width_, props->video_height_);
if (need_to_update_render_rect) { if (need_to_update_render_rect) {
render->UpdateRenderRect(); render->UpdateRenderRect();
} }