Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix navigation rail with long labels misplaced highlights #128324

Conversation

bleroux
Copy link
Contributor

@bleroux bleroux commented Jun 6, 2023

Description

This PR fixes an issue related to InkWell highlights being misplaced for navigation rail destinations with long labels.

  • Before:
flutter_128005_before.mp4
  • After:
flutter_128005_after.mp4

Related Issue

Fixes #128005

Tests

Adds 1 test.

@flutter-dashboard flutter-dashboard bot added f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. labels Jun 6, 2023
@bleroux bleroux requested a review from HansMuller June 6, 2023 15:01
Copy link
Contributor

@HansMuller HansMuller left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the addition of one comment, this looks good to go.

@@ -806,13 +810,15 @@ class _IndicatorInkWell extends InkResponse {

final bool useMaterial3;
final Offset indicatorOffset;
final bool applyXOffset;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment that explained what this flag is for would be helpful here.

@bleroux bleroux force-pushed the fix_navigation_rail_with_long_labels_misplaced_splashes branch 6 times, most recently from f430c99 to 698e7c3 Compare June 8, 2023 07:08
@bleroux bleroux force-pushed the fix_navigation_rail_with_long_labels_misplaced_splashes branch from 698e7c3 to f1e62c7 Compare June 8, 2023 19:12
@HansMuller HansMuller merged commit ceeaf98 into flutter:master Jun 8, 2023
72 checks passed
@feinstein
Copy link
Contributor

Why not make the offset nullable and if null don't use it, if not null use it, thus avoiding the offset boolean flag?

@bleroux
Copy link
Contributor Author

bleroux commented Jun 8, 2023

@feinstein Because the vertical offset is always used. I considered replacing the indicatorOffset by two variables, indicatorOffsetX and indicatorOffsetY but this was less readable.

@feinstein
Copy link
Contributor

Ok, makes sense. Thanks for the contribution.

@bleroux bleroux deleted the fix_navigation_rail_with_long_labels_misplaced_splashes branch June 9, 2023 07:29
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jun 9, 2023
flutter/flutter@6e254a3...da127f1

2023-06-09 hans.muller@gmail.com Updated material button theme tests for Material3 (flutter/flutter#128543)
2023-06-09 engine-flutter-autoroll@skia.org Roll Flutter Engine from cb93477008d6 to 93afba901b3b (2 revisions) (flutter/flutter#128573)
2023-06-09 6655696+guidezpl@users.noreply.github.com Improve defaults generation with logging, stats, and token validation (flutter/flutter#128244)
2023-06-09 whesse@google.com [testing] Make the FLUTTER_STORAGE_BASE_URL warning non-fatal (flutter/flutter#128335)
2023-06-09 danny@tuppeny.com [flutter_tools] [DAP] Don't try to restart/reload if app hasn't started yet (flutter/flutter#128267)
2023-06-09 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8f9e608d39ab to cb93477008d6 (3 revisions) (flutter/flutter#128568)
2023-06-09 tessertaha@gmail.com Replace `MaterialButton` from test classes (flutter/flutter#128466)
2023-06-09 tessertaha@gmail.com Fix `showBottomSheet` doesn't remove scrim when draggable sheet is dismissed (flutter/flutter#128455)
2023-06-09 engine-flutter-autoroll@skia.org Manual roll Flutter Engine from a5f7d5d75ff2 to 8f9e608d39ab (31 revisions) (flutter/flutter#128554)
2023-06-09 ychris@google.com Revert "test owners: cyanglaz -> vashworth" (flutter/flutter#128462)
2023-06-09 43054281+camsim99@users.noreply.github.com [Android] Bump integration tests using `compileSdkVersion` 31 to 33 (flutter/flutter#128072)
2023-06-09 dkwingsmt@users.noreply.github.com Remove single view assumption from MouseTracker, and unify its hit testing code flow (flutter/flutter#127060)
2023-06-09 christopherfujino@gmail.com [flutter_tools] Precache after channel switch (flutter/flutter#118129)
2023-06-08 leigha.jarett@gmail.com Adding migration guide for Material 3 colors (flutter/flutter#128429)
2023-06-08 gspencergoog@users.noreply.github.com Add `AppLifecycleListener`, with support for application exit handling (flutter/flutter#123274)
2023-06-08 thkim1011@users.noreply.github.com Sliver Main Axis Group (flutter/flutter#126596)
2023-06-08 31859944+LongCatIsLooong@users.noreply.github.com Reduce `_DoubleClampVisitor` false positives (flutter/flutter#128539)
2023-06-08 leigha.jarett@gmail.com Advise developers to use OverflowBar instead of ButtonBar (flutter/flutter#128437)
2023-06-08 jacksongardner@google.com Reland "Migrate benchmarks to package:web" (flutter/flutter#128266)
2023-06-08 53684884+mhbdev@users.noreply.github.com Navigator.pop before PopupMenuItem onTap call (flutter/flutter#127446)
2023-06-08 leroux_bruno@yahoo.fr Fix navigation rail with long labels misplaced highlights (flutter/flutter#128324)
2023-06-08 tessertaha@gmail.com Update `chip.dart` to use set of `MaterialState` (flutter/flutter#128507)
2023-06-08 jcollins@google.com Update flutter to dartdoc 6.3.0 and hide Icons implementation from doc pages (flutter/flutter#128442)
2023-06-08 31859944+LongCatIsLooong@users.noreply.github.com Disable blinking cursor when `EditableText.showCursor` is false (flutter/flutter#127562)
2023-06-08 41930132+hellohuanlin@users.noreply.github.com [floating_cursor_selection]add more comments on the tricky part (flutter/flutter#127227)
2023-06-08 goderbauer@google.com Move RenderObjectElement.updateChildren to Element (flutter/flutter#128458)
2023-06-08 goderbauer@google.com Fix PointerEventConverter doc (flutter/flutter#128452)
2023-06-08 engine-flutter-autoroll@skia.org Roll Packages from a84b2c2 to e13b8c4 (9 revisions) (flutter/flutter#128508)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NavigationRail with big labels show incorrect hover area in Material 3
3 participants