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

Merge pull request #3401 from fufesou/fix/avoid_scale_0

Browse Source 
Avoid dividing by 0 and setting scale to 0
This commit is contained in:
RustDesk 2023-02-27 15:13:18 +08:00 committed by GitHub
commit d8b025f3d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,13 +617,28 @@ class ViewStyle {
final int displayWidth; final int displayWidth;
final int displayHeight; final int displayHeight;
ViewStyle({ ViewStyle({
this.style = '', required this.style,
this.width = 0.0, required this.width,
this.height = 0.0, required this.height,
this.displayWidth = 0, required this.displayWidth,
this.displayHeight = 0, required this.displayHeight,
}); });
static defaultViewStyle() {
final desktop = (isDesktop || isWebDesktop);
final w =
desktop ? kDesktopDefaultDisplayWidth : kMobileDefaultDisplayWidth;
final h =
desktop ? kDesktopDefaultDisplayHeight : kMobileDefaultDisplayHeight;
return ViewStyle(
style: '',
width: w.toDouble(),
height: h.toDouble(),
displayWidth: w,
displayHeight: h,
);
}
static int _double2Int(double v) => (v * 100).round().toInt(); static int _double2Int(double v) => (v * 100).round().toInt();
@override @override
@ -652,9 +667,14 @@ class ViewStyle {
double get scale { double get scale {
double s = 1.0; double s = 1.0;
if (style == kRemoteViewStyleAdaptive) { if (style == kRemoteViewStyleAdaptive) {
final s1 = width / displayWidth; if (width != 0 &&
final s2 = height / displayHeight; height != 0 &&
s = s1 < s2 ? s1 : s2; displayWidth != 0 &&
displayHeight != 0) {
final s1 = width / displayWidth;
final s2 = height / displayHeight;
s = s1 < s2 ? s1 : s2;
}
} }
return s; return s;
} }
@ -680,7 +700,7 @@ class CanvasModel with ChangeNotifier {
// scroll offset y percent // scroll offset y percent
double _scrollY = 0.0; double _scrollY = 0.0;
ScrollStyle _scrollStyle = ScrollStyle.scrollauto; ScrollStyle _scrollStyle = ScrollStyle.scrollauto;
ViewStyle _lastViewStyle = ViewStyle(); ViewStyle _lastViewStyle = ViewStyle.defaultViewStyle();
final _imageOverflow = false.obs; final _imageOverflow = false.obs;