mirror of
https://github.com/rustdesk/rustdesk.git
synced 2024-11-23 19:49:05 +08:00
fix "Add to addresssBook" dropdown menu (#9878)
Signed-off-by: 21pages <sunboeasy@gmail.com>
This commit is contained in:
parent
6082bb2754
commit
a79a9f697b
42
.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
vendored
Normal file
42
.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
vendored
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
diff --git a/packages/flutter/lib/src/material/dropdown_menu.dart b/packages/flutter/lib/src/material/dropdown_menu.dart
|
||||||
|
index 7e634cd2aa..c1e9acc295 100644
|
||||||
|
--- a/packages/flutter/lib/src/material/dropdown_menu.dart
|
||||||
|
+++ b/packages/flutter/lib/src/material/dropdown_menu.dart
|
||||||
|
@@ -475,7 +475,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
|
||||||
|
final GlobalKey _leadingKey = GlobalKey();
|
||||||
|
late List<GlobalKey> buttonItemKeys;
|
||||||
|
final MenuController _controller = MenuController();
|
||||||
|
- late bool _enableFilter;
|
||||||
|
+ bool _enableFilter = false;
|
||||||
|
late List<DropdownMenuEntry<T>> filteredEntries;
|
||||||
|
List<Widget>? _initialMenu;
|
||||||
|
int? currentHighlight;
|
||||||
|
@@ -524,6 +524,11 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
|
||||||
|
}
|
||||||
|
_localTextEditingController = widget.controller ?? TextEditingController();
|
||||||
|
}
|
||||||
|
+ if (oldWidget.enableFilter != widget.enableFilter) {
|
||||||
|
+ if (!widget.enableFilter) {
|
||||||
|
+ _enableFilter = false;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
if (oldWidget.enableSearch != widget.enableSearch) {
|
||||||
|
if (!widget.enableSearch) {
|
||||||
|
currentHighlight = null;
|
||||||
|
@@ -663,6 +668,7 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
|
||||||
|
);
|
||||||
|
currentHighlight = widget.enableSearch ? i : null;
|
||||||
|
widget.onSelected?.call(entry.value);
|
||||||
|
+ _enableFilter = false;
|
||||||
|
}
|
||||||
|
: null,
|
||||||
|
requestFocusOnHover: false,
|
||||||
|
@@ -735,6 +741,8 @@ class _DropdownMenuState<T> extends State<DropdownMenu<T>> {
|
||||||
|
if (_enableFilter) {
|
||||||
|
filteredEntries = widget.filterCallback?.call(filteredEntries, _localTextEditingController!.text)
|
||||||
|
?? filter(widget.dropdownMenuEntries, _localTextEditingController!);
|
||||||
|
+ } else {
|
||||||
|
+ filteredEntries = widget.dropdownMenuEntries;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (widget.enableSearch) {
|
42
.github/workflows/flutter-build.yml
vendored
42
.github/workflows/flutter-build.yml
vendored
@ -114,6 +114,15 @@ jobs:
|
|||||||
Expand-Archive -Path windows-x64-release.zip -DestinationPath windows-x64-release
|
Expand-Archive -Path windows-x64-release.zip -DestinationPath windows-x64-release
|
||||||
mv -Force windows-x64-release/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
|
mv -Force windows-x64-release/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
# https://github.com/flutter/flutter/commit/b5847d364a26d727af58ab885a6123e0e5304b2b#diff-634a338bd9ed19b66a27beba35a8acf4defffd8beff256113e6811771a0c4821R543
|
||||||
|
PATCH_PATH="${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff"
|
||||||
|
PATCH_PATH=$(echo "$PATCH_PATH" | sed 's/\\/\//g')
|
||||||
|
[[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply "$PATCH_PATH"
|
||||||
|
|
||||||
- name: Install Rust toolchain
|
- name: Install Rust toolchain
|
||||||
uses: dtolnay/rust-toolchain@v1
|
uses: dtolnay/rust-toolchain@v1
|
||||||
with:
|
with:
|
||||||
@ -486,6 +495,11 @@ jobs:
|
|||||||
channel: "stable"
|
channel: "stable"
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
[[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
|
||||||
- name: Setup vcpkg with Github Actions binary cache
|
- name: Setup vcpkg with Github Actions binary cache
|
||||||
uses: lukka/run-vcpkg@v11
|
uses: lukka/run-vcpkg@v11
|
||||||
with:
|
with:
|
||||||
@ -687,6 +701,11 @@ jobs:
|
|||||||
channel: "stable"
|
channel: "stable"
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
[[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
|
||||||
- name: Workaround for flutter issue
|
- name: Workaround for flutter issue
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
@ -922,6 +941,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
channel: "stable"
|
channel: "stable"
|
||||||
flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }}
|
flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }}
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
[[ "3.24.4" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
|
||||||
- uses: nttld/setup-ndk@v1
|
- uses: nttld/setup-ndk@v1
|
||||||
id: setup-ndk
|
id: setup-ndk
|
||||||
with:
|
with:
|
||||||
@ -1194,6 +1219,11 @@ jobs:
|
|||||||
channel: "stable"
|
channel: "stable"
|
||||||
flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }}
|
flutter-version: ${{ env.ANDROID_FLUTTER_VERSION }}
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
[[ "3.24.4" == ${{env.ANDROID_FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
|
||||||
- name: Restore bridge files
|
- name: Restore bridge files
|
||||||
uses: actions/download-artifact@master
|
uses: actions/download-artifact@master
|
||||||
with:
|
with:
|
||||||
@ -1543,6 +1573,12 @@ jobs:
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
if [[ "3.24.4" == ${{ env.FLUTTER_VERSION }} ]]; then
|
||||||
|
pushd $(dirname $(dirname $(which flutter)))
|
||||||
|
git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
popd
|
||||||
|
fi
|
||||||
|
|
||||||
# build flutter
|
# build flutter
|
||||||
pushd /workspace
|
pushd /workspace
|
||||||
export CARGO_INCREMENTAL=0
|
export CARGO_INCREMENTAL=0
|
||||||
@ -2014,6 +2050,12 @@ jobs:
|
|||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
cache: true
|
cache: true
|
||||||
|
|
||||||
|
- name: Patch flutter
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
cd $(dirname $(dirname $(which flutter)))
|
||||||
|
[[ "3.24.4" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
|
||||||
|
|
||||||
# https://rustdesk.com/docs/en/dev/build/web/
|
# https://rustdesk.com/docs/en/dev/build/web/
|
||||||
- name: Build web
|
- name: Build web
|
||||||
shell: bash
|
shell: bash
|
||||||
|
Loading…
Reference in New Issue
Block a user