From 12919804dcacf52fa429eceedbf7578cbbeb15c8 Mon Sep 17 00:00:00 2001 From: dom Date: Thu, 19 Feb 2026 12:23:20 +0800 Subject: [PATCH] mouse cursor patch Signed-off-by: dom --- .github/workflows/build.yml | 7 ++++++- .github/workflows/ios.yml | 7 ++++++- .github/workflows/linux_x64.yml | 7 ++++++- .github/workflows/mac.yml | 7 ++++++- .github/workflows/win_x64.yml | 7 ++++++- ...-barrier-patch.diff => modal_barrier_patch.diff} | 0 lib/scripts/mouse_cursor_patch.diff | 13 +++++++++++++ 7 files changed, 43 insertions(+), 5 deletions(-) rename lib/scripts/{modal-barrier-patch.diff => modal_barrier_patch.diff} (100%) create mode 100644 lib/scripts/mouse_cursor_patch.diff diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc347e006..0894591f0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,12 @@ jobs: - name: apply modal barrier patch working-directory: ${{ env.FLUTTER_ROOT }} - run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true + run: git apply $GITHUB_WORKSPACE/lib/scripts/modal_barrier_patch.diff || true + continue-on-error: true + + - name: apply mouse cursor patch + working-directory: ${{ env.FLUTTER_ROOT }} + run: git apply $GITHUB_WORKSPACE/lib/scripts/mouse_cursor_patch.diff || true continue-on-error: true - name: Write key diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 75566e3f9..262b1de70 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -32,7 +32,12 @@ jobs: - name: apply modal barrier patch working-directory: ${{ env.FLUTTER_ROOT }} - run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true + run: git apply $GITHUB_WORKSPACE/lib/scripts/modal_barrier_patch.diff || true + continue-on-error: true + + - name: apply mouse cursor patch + working-directory: ${{ env.FLUTTER_ROOT }} + run: git apply $GITHUB_WORKSPACE/lib/scripts/mouse_cursor_patch.diff || true continue-on-error: true - name: Build iOS diff --git a/.github/workflows/linux_x64.yml b/.github/workflows/linux_x64.yml index bda991d19..8efff9aab 100644 --- a/.github/workflows/linux_x64.yml +++ b/.github/workflows/linux_x64.yml @@ -53,7 +53,12 @@ jobs: - name: apply modal barrier patch working-directory: ${{ env.FLUTTER_ROOT }} - run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true + run: git apply $GITHUB_WORKSPACE/lib/scripts/modal_barrier_patch.diff || true + continue-on-error: true + + - name: apply mouse cursor patch + working-directory: ${{ env.FLUTTER_ROOT }} + run: git apply $GITHUB_WORKSPACE/lib/scripts/mouse_cursor_patch.diff || true continue-on-error: true #TODO: deb and rpm packages need to be build diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 3a47ce113..35eb74b28 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -32,7 +32,12 @@ jobs: - name: apply modal barrier patch working-directory: ${{ env.FLUTTER_ROOT }} - run: git apply $GITHUB_WORKSPACE/lib/scripts/modal-barrier-patch.diff || true + run: git apply $GITHUB_WORKSPACE/lib/scripts/modal_barrier_patch.diff || true + continue-on-error: true + + - name: apply mouse cursor patch + working-directory: ${{ env.FLUTTER_ROOT }} + run: git apply $GITHUB_WORKSPACE/lib/scripts/mouse_cursor_patch.diff || true continue-on-error: true - name: Build Mac diff --git a/.github/workflows/win_x64.yml b/.github/workflows/win_x64.yml index 9aaa8979e..ffc9c2de6 100644 --- a/.github/workflows/win_x64.yml +++ b/.github/workflows/win_x64.yml @@ -28,10 +28,15 @@ jobs: - name: apply modal barrier patch working-directory: ${{ env.FLUTTER_ROOT }} - run: git apply $env:GITHUB_WORKSPACE\lib\scripts\modal-barrier-patch.diff || true + run: git apply $env:GITHUB_WORKSPACE\lib\scripts\modal_barrier_patch.diff || true shell: pwsh continue-on-error: true + - name: apply mouse cursor patch + working-directory: ${{ env.FLUTTER_ROOT }} + run: git apply $GITHUB_WORKSPACE/lib/scripts/mouse_cursor_patch.diff || true + continue-on-error: true + - name: Add fastforge and Inno Setup run: | dart pub global activate fastforge diff --git a/lib/scripts/modal-barrier-patch.diff b/lib/scripts/modal_barrier_patch.diff similarity index 100% rename from lib/scripts/modal-barrier-patch.diff rename to lib/scripts/modal_barrier_patch.diff diff --git a/lib/scripts/mouse_cursor_patch.diff b/lib/scripts/mouse_cursor_patch.diff new file mode 100644 index 000000000..c5b4e6066 --- /dev/null +++ b/lib/scripts/mouse_cursor_patch.diff @@ -0,0 +1,13 @@ +diff --git a/packages/flutter/lib/src/widgets/widget_state.dart b/packages/flutter/lib/src/widgets/widget_state.dart +index 1b683c51b66..b7277a49c75 100644 +--- a/packages/flutter/lib/src/widgets/widget_state.dart ++++ b/packages/flutter/lib/src/widgets/widget_state.dart +@@ -448,7 +448,7 @@ abstract class WidgetStateMouseCursor extends MouseCursor + if (states.contains(WidgetState.disabled)) { + return SystemMouseCursors.basic; + } +- return kIsWeb ? SystemMouseCursors.click : SystemMouseCursors.basic; ++ return SystemMouseCursors.click; + } + + /// A mouse cursor for widgets related to text, which resolves differently