Container fixes (#275)

* Fix container size inside Ink

Fix #266

* All print() methods replaced with logging.info()

Fix #273

* openPopupBrowserWindow()

Author: FeodorFitsner

package/lib/src/controls/container.dart

@@ -145,12 +145,16 @@ class ContainerControl extends StatelessWidget {
             return constrainedControl(
                 animation == null
                     ? Container(
+                        width: control.attrDouble("width"),
+                        height: control.attrDouble("height"),
                         margin: parseEdgeInsets(control, "margin"),
                         child: ink,
                       )
                     : AnimatedContainer(
                         duration: animation.duration,
                         curve: animation.curve,
+                        width: control.attrDouble("width"),
+                        height: control.attrDouble("height"),
                         margin: parseEdgeInsets(control, "margin"),
                         child: ink),
                 parent,
@@ -200,7 +204,6 @@ class ContainerControl extends StatelessWidget {
                       }
                     : null,
                 child: GestureDetector(
-                  child: container,
                   onTapDown: onClick
                       ? (details) {
                           debugPrint("Container ${control.id} clicked!");
@@ -224,6 +227,7 @@ class ContainerControl extends StatelessWidget {
                               eventData: "");
                         }
                       : null,
+                  child: container,
                 ),
               );
             }

package/lib/src/utils/platform_utils_non_web.dart

@@ -5,3 +5,6 @@ bool isProgressiveWebApp() {
 String getFletRouteUrlStrategy() {
   return "";
 }
+
+void openPopupBrowserWindow(
+    String url, String windowName, int minWidth, int minHeight) {}

package/lib/src/utils/platform_utils_web.dart

@@ -1,4 +1,5 @@
 import 'dart:html';
+import 'dart:math';
 
 bool isProgressiveWebApp() {
   return window.matchMedia('(display-mode: standalone)').matches ||
@@ -11,3 +12,17 @@ String getFletRouteUrlStrategy() {
       document.head?.querySelector("meta[name='flet-route-url-strategy']");
   return meta != null ? meta.attributes["content"]! : "";
 }
+
+void openPopupBrowserWindow(
+    String url, String windowName, int minWidth, int minHeight) {
+  int screenWidth = window.screen!.width!;
+  int screenHeight = window.screen!.height!;
+  final dualScreenLeft = window.screenLeft! < 0 ? -screenWidth : 0;
+  var toolbarHeight = window.outerHeight - window.innerHeight!;
+  var width = max(minWidth, screenWidth - 300);
+  var height = max(minHeight, screenHeight - 300);
+  var left = (screenWidth / 2) - (width / 2) + dualScreenLeft;
+  var top = (screenHeight / 2) - (height / 2) - toolbarHeight;
+  window.open(url, windowName,
+      "top=$top,left=$left,width=$width,height=$height,scrollbars=yes");
+}

sdk/python/flet/control.py

@@ -338,9 +338,6 @@ def build_update_commands(self, index, added_controls, commands, isolated=False)
             hashes[hash(ctrl)] = ctrl
             current_ints.append(hash(ctrl))
 
-        # print("previous_ints:", previous_ints)
-        # print("current_ints:", current_ints)
-
         sm = SequenceMatcher(None, previous_ints, current_ints)
 
         n = 0

sdk/python/flet/flet.py

@@ -64,7 +64,10 @@ def page(
         route_url_strategy=route_url_strategy,
     )
     url_prefix = os.getenv("FLET_DISPLAY_URL_PREFIX")
-    print("Page URL:" if url_prefix == None else url_prefix, conn.page_url)
+    if url_prefix != None:
+        print(url_prefix, conn.page_url)
+    else:
+        logging.info(f"Page URL: {conn.page_url}")
 
     page = Page(conn, constants.ZERO_SESSION)
     conn.sessions[constants.ZERO_SESSION] = page
@@ -105,7 +108,10 @@ def app(
     )
 
     url_prefix = os.getenv("FLET_DISPLAY_URL_PREFIX")
-    print("App URL:" if url_prefix == None else url_prefix, conn.page_url)
+    if url_prefix != None:
+        print(url_prefix, conn.page_url)
+    else:
+        logging.info(f"App URL: {conn.page_url}")
 
     terminate = threading.Event()
 
@@ -116,7 +122,7 @@ def exit_gracefully(signum, frame):
     signal.signal(signal.SIGINT, exit_gracefully)
     signal.signal(signal.SIGTERM, exit_gracefully)
 
-    print("Connected to Flet app and handling user sessions...")
+    logging.info("Connected to Flet app and handling user sessions...")
 
     fvp = None
 
@@ -198,13 +204,13 @@ def on_event(conn, e):
                 Event(e.eventTarget, e.eventName, e.eventData)
             )
             if e.eventTarget == "page" and e.eventName == "close":
-                print("Session closed:", e.sessionID)
+                logging.info(f"Session closed: {e.sessionID}")
                 del conn.sessions[e.sessionID]
 
     def on_session_created(conn, session_data):
         page = Page(conn, session_data.sessionID)
         conn.sessions[session_data.sessionID] = page
-        print("Session started:", session_data.sessionID)
+        logging.info(f"Session started: {session_data.sessionID}")
         try:
             assert session_handler is not None
             session_handler(page)
@@ -463,7 +469,7 @@ def _download_fletd():
     temp_fletd_dir = Path(tempfile.gettempdir()).joinpath(f"fletd-{ver}")
 
     if not temp_fletd_dir.exists():
-        print(f"Downloading Fletd v{ver} to {temp_fletd_dir}")
+        logging.info(f"Downloading Fletd v{ver} to {temp_fletd_dir}")
         temp_fletd_dir.mkdir(parents=True, exist_ok=True)
         ext = "zip" if is_windows() else "tar.gz"
         file_name = f"fletd-{ver}-{get_platform()}-{get_arch()}.{ext}"
@@ -492,7 +498,7 @@ def _download_fletd():
 def _download_flet_client(file_name):
     ver = version.version
     temp_arch = Path(tempfile.gettempdir()).joinpath(file_name)
-    print(f"Downloading Flet v{ver} to {temp_arch}")
+    logging.info(f"Downloading Flet v{ver} to {temp_arch}")
     flet_url = f"https://github.com/flet-dev/flet/releases/download/v{ver}/{file_name}"
     urllib.request.urlretrieve(flet_url, temp_arch)
     return str(temp_arch)
@@ -568,7 +574,6 @@ def print_output(self, p):
                 break
             line = line.decode("utf-8").rstrip("\r\n")
             if line.startswith(self.page_url_prefix):
-                # print(line)
                 if not self.page_url:
                     self.page_url = line[len(self.page_url_prefix) + 1 :]
                     print(self.page_url)
@@ -655,7 +660,6 @@ def main():
     port = args.port
     if args.port == None:
         port = _get_free_tcp_port()
-    # print("port:", port)
 
     my_event_handler = Handler(
         [sys.executable, "-u", script_path],
@@ -674,7 +678,7 @@ def main():
             if my_event_handler.terminate.wait(1):
                 break
     except KeyboardInterrupt:
-        pass  # print("Keyboard interrupt!")
+        pass
 
     if my_event_handler.fvp != None and not is_windows():
         try: