hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1433 from fufesou/fix_cursor_size_and_id

Browse Source 
sciter_desktop: fix cursor
This commit is contained in:
RustDesk 2022-09-02 19:07:36 +08:00 committed by GitHub
commit f37dc72bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui/remote.tis
View File

@ -67,6 +67,7 @@ function adaptDisplay() {
} }
} }
} }
refreshCursor();
handler.style.set { handler.style.set {
width: w / scaleFactor + "px", width: w / scaleFactor + "px",
height: h / scaleFactor + "px", height: h / scaleFactor + "px",
@ -98,6 +99,7 @@ var acc_wheel_delta_y0 = 0;
var total_wheel_time = 0; var total_wheel_time = 0;
var wheeling = false; var wheeling = false;
var dragging = false; var dragging = false;
var is_mouse_event_triggered = false;
// https://stackoverflow.com/questions/5833399/calculating-scroll-inertia-momentum // https://stackoverflow.com/questions/5833399/calculating-scroll-inertia-momentum
function resetWheel() { function resetWheel() {
@ -139,6 +141,7 @@ function accWheel(v, is_x) {
function handler.onMouse(evt) function handler.onMouse(evt)
{ {
is_mouse_event_triggered = true;
if (is_file_transfer || is_port_forward) return false; if (is_file_transfer || is_port_forward) return false;
if (view.windowState == View.WINDOW_FULL_SCREEN && !dragging) { if (view.windowState == View.WINDOW_FULL_SCREEN && !dragging) {
var dy = evt.y - scroll_body.scroll(#top); var dy = evt.y - scroll_body.scroll(#top);
@ -317,6 +320,7 @@ function handler.onMouse(evt)
return true; return true;
}; };
var cur_id = -1;
var cur_hotx = 0; var cur_hotx = 0;
var cur_hoty = 0; var cur_hoty = 0;
var cur_img = null; var cur_img = null;
@ -345,7 +349,7 @@ function scaleCursorImage(img) {
var useSystemCursor = true; var useSystemCursor = true;
function updateCursor(system=false) { function updateCursor(system=false) {
stdout.println("Update cursor, system: " + system); stdout.println("Update cursor, system: " + system);
useSystemCursor= system; useSystemCursor = system;
if (system) { if (system) {
handler.style#cursor = undefined; handler.style#cursor = undefined;
} else if (cur_img) { } else if (cur_img) {
@ -353,6 +357,12 @@ function updateCursor(system=false) {
} }
} }
function refreshCursor() {
if (cur_id != -1) {
handler.setCursorId(cur_id);
}
}
handler.setCursorData = function(id, hotx, hoty, width, height, colors) { handler.setCursorData = function(id, hotx, hoty, width, height, colors) {
cur_hotx = hotx; cur_hotx = hotx;
cur_hoty = hoty; cur_hoty = hoty;
@ -360,8 +370,9 @@ handler.setCursorData = function(id, hotx, hoty, width, height, colors) {
if (img) { if (img) {
image_binded = true; image_binded = true;
cursors[id] = [img, hotx, hoty, width, height]; cursors[id] = [img, hotx, hoty, width, height];
cur_id = id;
img = scaleCursorImage(img); img = scaleCursorImage(img);
if (cursor_img.style#display == 'none') { if (!first_mouse_event_triggered || cursor_img.style#display == 'none') {
self.timer(1ms, updateCursor); self.timer(1ms, updateCursor);
} }
cur_img = img; cur_img = img;
@ -371,11 +382,12 @@ handler.setCursorData = function(id, hotx, hoty, width, height, colors) {
handler.setCursorId = function(id) { handler.setCursorId = function(id) {
var img = cursors[id]; var img = cursors[id];
if (img) { if (img) {
cur_id = id;
image_binded = true; image_binded = true;
cur_hotx = img[1]; cur_hotx = img[1];
cur_hoty = img[2]; cur_hoty = img[2];
img = scaleCursorImage(img[0]); img = scaleCursorImage(img[0]);
if (cursor_img.style#display == 'none') { if (!first_mouse_event_triggered || cursor_img.style#display == 'none') {
self.timer(1ms, updateCursor); self.timer(1ms, updateCursor);
} }
cur_img = img; cur_img = img;