Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
27c4c56
initial commit
ndonkoHenri May 5, 2026
d9f276b
update test
ndonkoHenri May 5, 2026
0bd5a72
update changelog
ndonkoHenri May 5, 2026
f1929be
update changelog with PR number
ndonkoHenri May 5, 2026
409fab6
fix #6443: improve `LineChart` event spot serialization
ndonkoHenri May 5, 2026
5e18780
update changelogs and add dev-testing-skill
ndonkoHenri May 5, 2026
0bbec85
fix failing CI
ndonkoHenri May 5, 2026
1edca06
fix flaky screenshot capture: await endOfFrame before toImage()
FeodorFitsner May 6, 2026
342eaca
Merge branch 'release/v0.85.0' into fix-nav-destination-selected-icon
FeodorFitsner May 6, 2026
8a11c5f
test(row): pin viewport in test_alignment / test_vertical_alignment
FeodorFitsner May 6, 2026
f632488
fix #6429: update tile layer URL to OpenStreetMap
ndonkoHenri May 6, 2026
a62612f
test: bump screenshot capture delay to 200ms
FeodorFitsner May 6, 2026
2c9ef31
ci: bump test log level to DEBUG (temp)
FeodorFitsner May 6, 2026
0e3228e
test(row): pump_and_settle after resize_page
FeodorFitsner May 6, 2026
1285f55
test(row): revert resize_page additions
FeodorFitsner May 6, 2026
3213c10
test(row): pump 2s before test_alignment capture
FeodorFitsner May 6, 2026
08e15f5
example(row/alignment): drop redundant inner Column scroll
FeodorFitsner May 6, 2026
0d61e6b
revert diagnostic-only changes
FeodorFitsner May 6, 2026
5af6475
fix(scrollable_control): use MediaQuery.sizeOf instead of LayoutBuilder
FeodorFitsner May 6, 2026
2a63caf
fix(scrollable_control): replace LayoutBuilder with paired RenderProx…
FeodorFitsner May 6, 2026
f8cd952
fix(scrollable_control): mark inner enforcer dirty on outer constrain…
FeodorFitsner May 6, 2026
dfcf014
ci: restore full integration test matrix
FeodorFitsner May 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
* Fix `Page.on_resize` and `Page.on_media_change` not firing after mobile orientation changes ([#6457](https://github.com/flet-dev/flet/issues/6457), [#6423](https://github.com/flet-dev/flet/pull/6423)) by @ndonkoHenri.
* Fix `flet pack` desktop packaging so Windows and Linux bundles include the expected client archive, and Windows taskbar pins point to the packed app instead of the cached `flet.exe` ([#5151](https://github.com/flet-dev/flet/issues/5151), [#6403](https://github.com/flet-dev/flet/pull/6403)) by @ndonkoHenri.
* Fix environment variable priority in `flet build` template: inherit from `Platform.environment` and use `putIfAbsent` for FLET_* variables so pre-set system env vars are not overwritten ([#6394](https://github.com/flet-dev/flet/pull/6394)) by @Bahtya.
* Fix `NavigationBarDestination.selected_icon` rendering wrongly when provided as an `Icon` control ([#6460](https://github.com/flet-dev/flet/issues/6460), [#6468](https://github.com/flet-dev/flet/pull/6468)) by @ndonkoHenri.
* Fix 3- and 4-digit hex color shorthand (e.g. `#c00`, `#fc00`) rendering as invisible by expanding them to their full 6/8-digit forms ([#6419](https://github.com/flet-dev/flet/issues/6419), [#6421](https://github.com/flet-dev/flet/pull/6421)) by @ndonkoHenri.
* Fix `LineChart` (and other charts) silently dropping custom `ChartAxisLabel` entries whose `value` matched a tick only after floating-point rounding (e.g. `0.1`, `0.2`, `0.3`) by switching label lookup to a tolerance-based comparison scaled to the axis interval ([#6445](https://github.com/flet-dev/flet/issues/6445), [#6459](https://github.com/flet-dev/flet/pull/6459)) by @KangZhaoKui.

Expand Down
14 changes: 6 additions & 8 deletions packages/flet/lib/src/controls/navigation_bar_destination.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import 'package:flutter/material.dart';

import '../extensions/control.dart';
import '../models/control.dart';
import '../utils/icons.dart';
import '../utils/numbers.dart';
import 'base_controls.dart';

Expand All @@ -15,14 +14,13 @@ class NavigationBarDestinationControl extends StatelessWidget {
Widget build(BuildContext context) {
debugPrint("NavigationBarDestination build: ${control.id}");

var selectedIcon = control.getIconData("selected_icon");
var child = NavigationDestination(
enabled: !control.disabled,
tooltip: !control.disabled ? control.getString("tooltip") : null,
icon: control.buildIconOrWidget("icon")!,
selectedIcon: control.buildWidget("selected_icon") ??
(selectedIcon != null ? Icon(selectedIcon) : null),
label: control.getString("label", "")!);
enabled: !control.disabled,
tooltip: !control.disabled ? control.getString("tooltip") : null,
icon: control.buildIconOrWidget("icon")!,
selectedIcon: control.buildIconOrWidget("selected_icon"),
label: control.getString("label", "")!,
);

return BaseControl(control: control, child: child);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ async def test_basic(flet_app: ftt.FletTestApp, request):
await flet_app.assert_control_screenshot(
request.node.name,
ft.NavigationBar(
selected_index=2,
destinations=[
ft.NavigationBarDestination(icon=ft.Icons.EXPLORE, label="Explore"),
ft.NavigationBarDestination(icon=ft.Icons.COMMUTE, label="Commute"),
ft.NavigationBarDestination(
icon=ft.Icons.BOOKMARK_BORDER,
selected_icon=ft.Icons.BOOKMARK,
selected_icon=ft.Icon(ft.Icons.BOOKMARK),
label="Favorites",
),
]
],
),
)

Expand Down
Loading