Any control can be positioned absolutely inside Stack (#60)

All visible controls got 4 new properties: - left - top - right - bottom
flet-dev · Jul 8, 2022 · c7333dc · c7333dc
1 parent b3763a6
commit c7333dc
Show file tree

Hide file tree

Showing 27 changed files with 274 additions and 4 deletions.
diff --git a/client/lib/controls/create_control.dart b/client/lib/controls/create_control.dart
@@ -252,8 +252,11 @@ Widget baseControl(Widget widget, Control? parent, Control control) {
 
 Widget constrainedControl(Widget widget, Control? parent, Control control) {
   return _expandable(
-      _sizedControl(
-          _tooltip(_opacity(widget, parent, control), parent, control),
+      _positionedControl(
+          _sizedControl(
+              _tooltip(_opacity(widget, parent, control), parent, control),
+              parent,
+              control),
           parent,
           control),
       parent,
@@ -282,6 +285,25 @@ Widget _tooltip(Widget widget, Control? parent, Control control) {
       : widget;
 }
 
+Widget _positionedControl(Widget widget, Control? parent, Control control) {
+  var left = control.attrDouble("left", null);
+  var top = control.attrDouble("top", null);
+  var right = control.attrDouble("right", null);
+  var bottom = control.attrDouble("bottom", null);
+
+  if (left != null || top != null || right != null || bottom != null) {
+    debugPrint("Positioned");
+    return Positioned(
+      left: left,
+      top: top,
+      right: right,
+      bottom: bottom,
+      child: widget,
+    );
+  }
+  return widget;
+}
+
 Widget _sizedControl(Widget widget, Control? parent, Control control) {
   var width = control.attrDouble("width", null);
   var height = control.attrDouble("height", null);

diff --git a/sdk/python/flet/card.py b/sdk/python/flet/card.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -32,6 +36,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/checkbox.py b/sdk/python/flet/checkbox.py
@@ -21,6 +21,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -44,6 +48,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/circle_avatar.py b/sdk/python/flet/circle_avatar.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -37,6 +41,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/column.py b/sdk/python/flet/column.py
@@ -20,6 +20,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         visible: bool = None,
@@ -42,6 +46,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             visible=visible,

diff --git a/sdk/python/flet/constrained_control.py b/sdk/python/flet/constrained_control.py
@@ -1,8 +1,8 @@
-from typing import Optional, Union
+from typing import Union
 
 from beartype import beartype
 
-from flet.control import Control, InputBorder, OptionalNumber
+from flet.control import Control, OptionalNumber
 from flet.ref import Ref
 
 
@@ -21,6 +21,10 @@ def __init__(
         #
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
     ):
         Control.__init__(
             self,
@@ -35,6 +39,10 @@ def __init__(
 
         self.width = width
         self.height = height
+        self.left = left
+        self.top = top
+        self.right = right
+        self.bottom = bottom
 
     # width
     @property
@@ -55,3 +63,43 @@ def height(self) -> OptionalNumber:
     @beartype
     def height(self, value: OptionalNumber):
         self._set_attr("height", value)
+
+    # left
+    @property
+    def left(self) -> OptionalNumber:
+        return self._get_attr("left")
+
+    @left.setter
+    @beartype
+    def left(self, value: OptionalNumber):
+        self._set_attr("left", value)
+
+    # top
+    @property
+    def top(self) -> OptionalNumber:
+        return self._get_attr("top")
+
+    @top.setter
+    @beartype
+    def top(self, value: OptionalNumber):
+        self._set_attr("top", value)
+
+    # right
+    @property
+    def right(self) -> OptionalNumber:
+        return self._get_attr("right")
+
+    @right.setter
+    @beartype
+    def right(self, value: OptionalNumber):
+        self._set_attr("right", value)
+
+    # bottom
+    @property
+    def bottom(self) -> OptionalNumber:
+        return self._get_attr("bottom")
+
+    @bottom.setter
+    @beartype
+    def bottom(self, value: OptionalNumber):
+        self._set_attr("bottom", value)
diff --git a/sdk/python/flet/container.py b/sdk/python/flet/container.py
@@ -29,6 +29,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -52,6 +56,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/elevated_button.py b/sdk/python/flet/elevated_button.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -37,6 +41,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/floating_action_button.py b/sdk/python/flet/floating_action_button.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -34,6 +38,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/form_field_control.py b/sdk/python/flet/form_field_control.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -44,6 +48,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/grid_view.py b/sdk/python/flet/grid_view.py
@@ -15,6 +15,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         visible: bool = None,
@@ -36,6 +40,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             visible=visible,

diff --git a/sdk/python/flet/icon_button.py b/sdk/python/flet/icon_button.py
@@ -14,6 +14,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -35,6 +39,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/list_tile.py b/sdk/python/flet/list_tile.py
@@ -15,6 +15,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         tooltip: str = None,
@@ -40,6 +44,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             tooltip=tooltip,

diff --git a/sdk/python/flet/list_view.py b/sdk/python/flet/list_view.py
@@ -15,6 +15,10 @@ def __init__(
         ref: Ref = None,
         width: OptionalNumber = None,
         height: OptionalNumber = None,
+        left: OptionalNumber = None,
+        top: OptionalNumber = None,
+        right: OptionalNumber = None,
+        bottom: OptionalNumber = None,
         expand: Union[bool, int] = None,
         opacity: OptionalNumber = None,
         visible: bool = None,
@@ -36,6 +40,10 @@ def __init__(
             ref=ref,
             width=width,
             height=height,
+            left=left,
+            top=top,
+            right=right,
+            bottom=bottom,
             expand=expand,
             opacity=opacity,
             visible=visible,