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

fix: mobile view style, on conn (#9786)

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-10-30 19:00:07 +08:00 committed by GitHub
parent 32dbc0c8fb
commit 0b8cccd8be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flutter/lib/models/model.dart
View File

@ -1275,13 +1275,6 @@ class ImageModel with ChangeNotifier {
if (isDesktop || isWebDesktop) { if (isDesktop || isWebDesktop) {
await parent.target?.canvasModel.updateViewStyle(); await parent.target?.canvasModel.updateViewStyle();
await parent.target?.canvasModel.updateScrollStyle(); await parent.target?.canvasModel.updateScrollStyle();
} else {
final size = MediaQueryData.fromWindow(ui.window).size;
final canvasWidth = size.width;
final canvasHeight = size.height;
final xscale = canvasWidth / image.width;
final yscale = canvasHeight / image.height;
parent.target?.canvasModel.scale = min(xscale, yscale);
} }
if (parent.target != null) { if (parent.target != null) {
await initializeCursorAndCanvas(parent.target!); await initializeCursorAndCanvas(parent.target!);
@ -1679,6 +1672,7 @@ class CanvasModel with ChangeNotifier {
_x = 0; _x = 0;
_y = 0; _y = 0;
_scale = 1.0; _scale = 1.0;
_lastViewStyle = ViewStyle.defaultViewStyle();
} }
updateScrollPercent() { updateScrollPercent() {

3
libs/hbb_common/src/config.rs
View File

@ -1710,6 +1710,9 @@ impl UserDefaultConfig {
pub fn get(&self, key: &str) -> String { pub fn get(&self, key: &str) -> String {
match key { match key {
#[cfg(any(target_os = "android", target_os = "ios"))]
keys::OPTION_VIEW_STYLE => self.get_string(key, "adaptive", vec!["original"]),
#[cfg(not(any(target_os = "android", target_os = "ios")))]
keys::OPTION_VIEW_STYLE => self.get_string(key, "original", vec!["adaptive"]), keys::OPTION_VIEW_STYLE => self.get_string(key, "original", vec!["adaptive"]),
keys::OPTION_SCROLL_STYLE => self.get_string(key, "scrollauto", vec!["scrollbar"]), keys::OPTION_SCROLL_STYLE => self.get_string(key, "scrollauto", vec!["scrollbar"]),
keys::OPTION_IMAGE_QUALITY => { keys::OPTION_IMAGE_QUALITY => {