diff --git a/packages/flet/lib/src/controls/button.dart b/packages/flet/lib/src/controls/button.dart index c154ec97e..3d2b276ad 100644 --- a/packages/flet/lib/src/controls/button.dart +++ b/packages/flet/lib/src/controls/button.dart @@ -98,7 +98,7 @@ class _ButtonControlState extends State with FletStoreMixin { var theme = Theme.of(context); var style = parseButtonStyle( - widget.control.internals?["style"], + widget.control.internals?["style"] ?? widget.control.get("style"), theme, defaultForegroundColor: widget.control.getColor("color", context, theme.colorScheme.primary)!, diff --git a/packages/flet/lib/src/controls/dropdown.dart b/packages/flet/lib/src/controls/dropdown.dart index dc472f1d6..abaa6511a 100644 --- a/packages/flet/lib/src/controls/dropdown.dart +++ b/packages/flet/lib/src/controls/dropdown.dart @@ -10,6 +10,7 @@ import '../utils/buttons.dart'; import '../utils/colors.dart'; import '../utils/edge_insets.dart'; import '../utils/form_field.dart'; +import '../utils/layout.dart'; import '../utils/menu.dart'; import '../utils/numbers.dart'; import '../utils/text.dart'; @@ -270,6 +271,9 @@ class _DropdownControlState extends State { _focusNode.canRequestFocus = editable; + int expand = widget.control.getExpand("expand", 0)!; + EdgeInsets? expandedInsets = expand > 0 ? EdgeInsets.zero : null; + Widget dropDown = DropdownMenu( enabled: !widget.control.disabled, focusNode: _focusNode, @@ -291,6 +295,7 @@ class _DropdownControlState extends State { hintText: widget.control.getString("hint_text"), helperText: widget.control.getString("helper_text"), menuStyle: menuStyle, + expandedInsets: expandedInsets, inputDecorationTheme: inputDecorationTheme, inputFormatters: inputFormatters.isEmpty ? null : inputFormatters, onSelected: widget.control.disabled