Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rustdesk
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李朝发
rustdesk
Commits
21eb7bd1
Commit
21eb7bd1
authored
Sep 19, 2022
by
Kingtous
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt: more configurable scroll logic & edge size
parent
bf1314f9
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
79 additions
and
47 deletions
+79
-47
common.dart
flutter/lib/common.dart
+1
-0
desktop_tab_page.dart
flutter/lib/desktop/pages/desktop_tab_page.dart
+1
-1
file_manager_tab_page.dart
flutter/lib/desktop/pages/file_manager_tab_page.dart
+1
-0
port_forward_tab_page.dart
flutter/lib/desktop/pages/port_forward_tab_page.dart
+1
-0
remote_tab_page.dart
flutter/lib/desktop/pages/remote_tab_page.dart
+1
-1
peer_widget.dart
flutter/lib/desktop/widgets/peer_widget.dart
+52
-45
scroll_wrapper.dart
flutter/lib/desktop/widgets/scroll_wrapper.dart
+21
-0
pubspec.yaml
flutter/pubspec.yaml
+1
-0
No files found.
flutter/lib/common.dart
View file @
21eb7bd1
...
@@ -248,6 +248,7 @@ List<Locale> supportedLocales = const [
...
@@ -248,6 +248,7 @@ List<Locale> supportedLocales = const [
// specify CN/TW to fix CJK issue in flutter
// specify CN/TW to fix CJK issue in flutter
Locale
(
'zh'
,
'CN'
),
Locale
(
'zh'
,
'CN'
),
Locale
(
'zh'
,
'TW'
),
Locale
(
'zh'
,
'TW'
),
Locale
(
'zh'
,
'SG'
),
Locale
(
'fr'
),
Locale
(
'fr'
),
Locale
(
'de'
),
Locale
(
'de'
),
Locale
(
'it'
),
Locale
(
'it'
),
...
...
flutter/lib/desktop/pages/desktop_tab_page.dart
View file @
21eb7bd1
...
@@ -60,7 +60,7 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
...
@@ -60,7 +60,7 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
return
Platform
.
isMacOS
return
Platform
.
isMacOS
?
tabWidget
?
tabWidget
:
Obx
(()
=>
DragToResizeArea
(
:
Obx
(()
=>
DragToResizeArea
(
resizeEdgeSize:
fullscreen
.
value
?
1.0
:
8
.0
,
child:
tabWidget
));
resizeEdgeSize:
fullscreen
.
value
?
1.0
:
4
.0
,
child:
tabWidget
));
}
}
void
onAddSetting
()
{
void
onAddSetting
()
{
...
...
flutter/lib/desktop/pages/file_manager_tab_page.dart
View file @
21eb7bd1
...
@@ -81,6 +81,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
...
@@ -81,6 +81,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
return
Platform
.
isMacOS
return
Platform
.
isMacOS
?
tabWidget
?
tabWidget
:
SubWindowDragToResizeArea
(
:
SubWindowDragToResizeArea
(
resizeEdgeSize:
4.0
,
windowId:
windowId
(),
windowId:
windowId
(),
child:
tabWidget
,
child:
tabWidget
,
);
);
...
...
flutter/lib/desktop/pages/port_forward_tab_page.dart
View file @
21eb7bd1
...
@@ -92,6 +92,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
...
@@ -92,6 +92,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
return
Platform
.
isMacOS
return
Platform
.
isMacOS
?
tabWidget
?
tabWidget
:
SubWindowDragToResizeArea
(
:
SubWindowDragToResizeArea
(
resizeEdgeSize:
4.0
,
windowId:
windowId
(),
windowId:
windowId
(),
child:
tabWidget
,
child:
tabWidget
,
);
);
...
...
flutter/lib/desktop/pages/remote_tab_page.dart
View file @
21eb7bd1
...
@@ -143,7 +143,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
...
@@ -143,7 +143,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
return
Platform
.
isMacOS
return
Platform
.
isMacOS
?
tabWidget
?
tabWidget
:
Obx
(()
=>
SubWindowDragToResizeArea
(
:
Obx
(()
=>
SubWindowDragToResizeArea
(
resizeEdgeSize:
fullscreen
.
value
?
1.0
:
8
.0
,
resizeEdgeSize:
fullscreen
.
value
?
1.0
:
4
.0
,
windowId:
windowId
(),
windowId:
windowId
(),
child:
tabWidget
));
child:
tabWidget
));
}
}
...
...
flutter/lib/desktop/widgets/peer_widget.dart
View file @
21eb7bd1
...
@@ -2,6 +2,7 @@ import 'dart:async';
...
@@ -2,6 +2,7 @@ import 'dart:async';
import
'package:flutter/foundation.dart'
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter/material.dart'
;
import
'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart'
;
import
'package:get/get.dart'
;
import
'package:get/get.dart'
;
import
'package:provider/provider.dart'
;
import
'package:provider/provider.dart'
;
import
'package:visibility_detector/visibility_detector.dart'
;
import
'package:visibility_detector/visibility_detector.dart'
;
...
@@ -41,6 +42,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
...
@@ -41,6 +42,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
static
const
int
_maxQueryCount
=
3
;
static
const
int
_maxQueryCount
=
3
;
final
_curPeers
=
<
String
>{};
final
_curPeers
=
<
String
>{};
final
_scrollController
=
ScrollController
();
var
_lastChangeTime
=
DateTime
.
now
();
var
_lastChangeTime
=
DateTime
.
now
();
var
_lastQueryPeers
=
<
String
>{};
var
_lastQueryPeers
=
<
String
>{};
var
_lastQueryTime
=
DateTime
.
now
().
subtract
(
const
Duration
(
hours:
1
));
var
_lastQueryTime
=
DateTime
.
now
().
subtract
(
const
Duration
(
hours:
1
));
...
@@ -84,8 +86,10 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
...
@@ -84,8 +86,10 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
?
Center
(
?
Center
(
child:
Text
(
translate
(
"Empty"
)),
child:
Text
(
translate
(
"Empty"
)),
)
)
:
SingleChildScrollView
(
:
DesktopScrollWrapper
(
controller:
ScrollController
(),
scrollController:
_scrollController
,
child:
SingleChildScrollView
(
controller:
_scrollController
,
child:
ObxValue
<
RxString
>((
searchText
)
{
child:
ObxValue
<
RxString
>((
searchText
)
{
return
FutureBuilder
<
List
<
Peer
>>(
return
FutureBuilder
<
List
<
Peer
>>(
builder:
(
context
,
snapshot
)
{
builder:
(
context
,
snapshot
)
{
...
@@ -121,7 +125,9 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
...
@@ -121,7 +125,9 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
)));
)));
}
}
return
Wrap
(
return
Wrap
(
spacing:
space
,
runSpacing:
space
,
children:
cards
);
spacing:
space
,
runSpacing:
space
,
children:
cards
);
}
else
{
}
else
{
return
const
Center
(
return
const
Center
(
child:
CircularProgressIndicator
(),
child:
CircularProgressIndicator
(),
...
@@ -133,6 +139,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
...
@@ -133,6 +139,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
},
peerSearchText
),
},
peerSearchText
),
),
),
),
),
),
);
);
}
}
...
...
flutter/lib/desktop/widgets/scroll_wrapper.dart
0 → 100644
View file @
21eb7bd1
import
'package:flutter/widgets.dart'
;
import
'package:flutter_improved_scrolling/flutter_improved_scrolling.dart'
;
class
DesktopScrollWrapper
extends
StatelessWidget
{
final
ScrollController
scrollController
;
final
Widget
child
;
const
DesktopScrollWrapper
(
{
Key
?
key
,
required
this
.
scrollController
,
required
this
.
child
})
:
super
(
key:
key
);
@override
Widget
build
(
BuildContext
context
)
{
return
ImprovedScrolling
(
scrollController:
scrollController
,
enableCustomMouseWheelScrolling:
false
,
customMouseWheelScrollConfig:
const
CustomMouseWheelScrollConfig
(
scrollAmountMultiplier:
3.0
),
child:
child
,
);
}
}
flutter/pubspec.yaml
View file @
21eb7bd1
...
@@ -80,6 +80,7 @@ dependencies:
...
@@ -80,6 +80,7 @@ dependencies:
desktop_drop
:
^0.3.3
desktop_drop
:
^0.3.3
scroll_pos
:
^0.3.0
scroll_pos
:
^0.3.0
rxdart
:
^0.27.5
rxdart
:
^0.27.5
flutter_improved_scrolling
:
^0.0.3
dev_dependencies
:
dev_dependencies
:
icons_launcher
:
^2.0.4
icons_launcher
:
^2.0.4
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment