TheLanc3/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2026-04-04 15:11:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5873 from 21pages/cm_width

Browse Source 
opt cm width and elevation requires keyboard permission
This commit is contained in:
RustDesk
2023-10-01 12:49:20 +08:00
committed by GitHub
parent 44554cb54b 17a56bbf48
commit 6e3e60a44d
43 changed files with 115 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/io_loop.rs
View File

@@ -1318,9 +1318,10 @@ impl<T: InvokeUiSession> Remote<T> {
}
}
Some(misc::Union::Uac(uac)) => {
let keyboard = self.handler.server_keyboard_enabled.read().unwrap().clone();
#[cfg(feature = "flutter")]
{
if uac {
if uac && keyboard {
self.handler.msgbox(
"on-uac",
"Prompt",
@@ -1339,7 +1340,7 @@ impl<T: InvokeUiSession> Remote<T> {
let title = "Prompt";
let text = "Please wait for confirmation of UAC...";
let link = "";
if uac {
if uac && keyboard {
self.handler.msgbox(msgtype, title, text, link);
} else {
self.handler.cancel_msgbox(&format!(
@@ -1350,9 +1351,10 @@ impl<T: InvokeUiSession> Remote<T> {
}
}
Some(misc::Union::ForegroundWindowElevated(elevated)) => {
let keyboard = self.handler.server_keyboard_enabled.read().unwrap().clone();
#[cfg(feature = "flutter")]
{
if elevated {
if elevated && keyboard {
self.handler.msgbox(
"on-foreground-elevated",
"Prompt",
@@ -1371,7 +1373,7 @@ impl<T: InvokeUiSession> Remote<T> {
let title = "Prompt";
let text = "elevated_foreground_window_tip";
let link = "";
if elevated {
if elevated && keyboard {
self.handler.msgbox(msgtype, title, text, link);
} else {
self.handler.cancel_msgbox(&format!(
@@ -1385,6 +1387,7 @@ impl<T: InvokeUiSession> Remote<T> {
if err.is_empty() {
self.handler.msgbox("wait-uac", "", "", "");
} else {
self.handler.cancel_msgbox("wait-uac");
self.handler
.msgbox("elevation-error", "Elevation Error", &err, "");
}