Skip to content

Commit

Permalink
Ensure NavigationAppBar.actions are rendered on the top of the othe…
Browse files Browse the repository at this point in the history
…r widgets (Fixes #177)
  • Loading branch information
bdlukaa committed Feb 17, 2022
1 parent efcfb2f commit aa94c61
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Date format: DD/MM/YYYY
- When a suggestion is picked, the overlay is automatically closed and the text box is unfocused
- Clear button now only shows when the text box is focused
- Add directionality support ([#184](https://github.com/bdlukaa/fluent_ui/pull/184))
- Ensure `NavigationAppBar.actions` are rendered on the top of the other widgets ([#177](https://github.com/bdlukaa/fluent_ui/issues/177))

## [3.9.0] - Fidelity - [10/02/2022]

Expand Down
1 change: 0 additions & 1 deletion example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ class _MyHomePageState extends State<MyHomePage> {
final appTheme = context.watch<AppTheme>();
return NavigationView(
appBar: NavigationAppBar(
// height: !kIsWeb ? appWindow.titleBarHeight : 31.0,
title: () {
if (kIsWeb) return const Text(appTitle);
return MoveWindow(
Expand Down
10 changes: 5 additions & 5 deletions lib/src/controls/navigation/navigation_view/view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ class _NavigationAppBar extends StatelessWidget {
? _kCompactNavigationPanelWidth
: _kOpenNavigationPanelWidth;
result = Stack(children: [
Row(children: [
leading,
if (additionalLeading != null) additionalLeading!,
Expanded(child: title),
]),
if (appBar.actions != null)
Positioned.directional(
textDirection: direction,
Expand All @@ -690,11 +695,6 @@ class _NavigationAppBar extends StatelessWidget {
child: appBar.actions!,
),
),
Row(children: [
leading,
if (additionalLeading != null) additionalLeading!,
Expanded(child: title),
]),
]);
break;
default:
Expand Down

0 comments on commit aa94c61

Please sign in to comment.