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

more fix on linux

Browse Source
This commit is contained in:
rustdesk 2021-05-02 22:55:50 +08:00
parent 2adc774d8a
commit b5e8b9ee0d
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -2842,8 +2842,8 @@ dependencies = [
[[package]] [[package]]
name = "sciter-rs" name = "sciter-rs"
version = "0.5.56" version = "0.5.53"
source = "git+https://github.com/sciter-sdk/rust-sciter#d318df56eafe7800015c790f5880f6183551fdce" source = "git+https://github.com/sciter-sdk/rust-sciter?rev=7702fb17290e76606bdd7010a0c3cbb32e85db76#7702fb17290e76606bdd7010a0c3cbb32e85db76"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",

2
Cargo.toml
View File

@ -46,7 +46,7 @@ cpal = { git = "https://github.com/rustaudio/cpal" }
[target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies] [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
machine-uid = "0.2" machine-uid = "0.2"
mac_address = "1.1" mac_address = "1.1"
sciter-rs = { git = "https://github.com/sciter-sdk/rust-sciter" } sciter-rs = { git = "https://github.com/sciter-sdk/rust-sciter", rev = "7702fb17290e76606bdd7010a0c3cbb32e85db76" }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
systray = { path = "libs/systray-rs" } systray = { path = "libs/systray-rs" }

4
src/ui/cm.tis
View File

@ -246,7 +246,11 @@ function update() {
function bring_to_top(idx=-1) { function bring_to_top(idx=-1) {
if (view.windowState == View.WINDOW_HIDDEN || view.windowState == View.WINDOW_MINIMIZED) { if (view.windowState == View.WINDOW_HIDDEN || view.windowState == View.WINDOW_MINIMIZED) {
if (is_linux) {
view.focus = self;
} else {
view.windowState = View.WINDOW_SHOWN; view.windowState = View.WINDOW_SHOWN;
}
if (idx >= 0) body.cur = idx; if (idx >= 0) body.cur = idx;
} else { } else {
view.windowTopmost = true; view.windowTopmost = true;

2
src/ui/header.tis
View File

@ -86,7 +86,7 @@ class Header: Reactor.Component {
if (is_osx) style += "margin: *"; if (is_osx) style += "margin: *";
self.timer(1ms, toggleMenuState); self.timer(1ms, toggleMenuState);
return <div style={style}> return <div style={style}>
{is_osx ? "" : <span #fullscreen>{svg_fullscreen}</span>} {is_osx || is_xfce ? "" : <span #fullscreen>{svg_fullscreen}</span>}
<div #screens> <div #screens>
<span #secure title={title_conn}>{icon_conn}</span> <span #secure title={title_conn}>{icon_conn}</span>
<div .remote-id>{handler.get_id()}</div> <div .remote-id>{handler.get_id()}</div>

5
src/ui/remote.tis
View File

@ -10,6 +10,7 @@ var display_scale = 1;
var keyboard_enabled = true; // server side var keyboard_enabled = true; // server side
var clipboard_enabled = true; // server side var clipboard_enabled = true; // server side
var audio_enabled = true; // server side var audio_enabled = true; // server side
var scroll_body = $(body);
handler.setDisplay = function(x, y, w, h) { handler.setDisplay = function(x, y, w, h) {
display_width = w; display_width = w;
@ -166,7 +167,7 @@ function handler.onMouse(evt)
{ {
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) {
if (evt.y < 10) { if (evt.y - scroll_body.scroll(#top) < 10) {
if (!wait_window_toolbar) { if (!wait_window_toolbar) {
wait_window_toolbar = true; wait_window_toolbar = true;
self.timer(300ms, function() { self.timer(300ms, function() {
@ -392,7 +393,7 @@ handler.adaptSize = function() {
size_adapted = true; size_adapted = true;
var (sx, sy, sw, sh) = view.screenBox(#workarea, #rectw); var (sx, sy, sw, sh) = view.screenBox(#workarea, #rectw);
var (fx, fy, fw, fh) = view.screenBox(#frame, #rectw); var (fx, fy, fw, fh) = view.screenBox(#frame, #rectw);
workarea_offset = sy; if (is_osx) workarea_offset = sy;
var r = handler.get_size(); var r = handler.get_size();
if (r[2] > 0) { if (r[2] > 0) {
if (r[2] >= fw && r[3] >= fh) { if (r[2] >= fw && r[3] >= fh) {