From bdd3bab3a5cc429cd22f0dfe8da0103f36b69c09 Mon Sep 17 00:00:00 2001
From: paul <paul.sajo.official@gmail.com>
Date: Sun, 30 Mar 2025 05:46:03 +0530
Subject: [PATCH] corrected grid weight and grid config position in toolbar

---
 src/frameworks/customtk/constants/cursor.js |  1 +
 src/frameworks/customtk/widgets/base.js     | 12 ++++++++++++
 src/frameworks/customtk/widgets/frame.js    |  9 ++++++---
 src/frameworks/tkinter/constants/cursor.js  |  1 +
 src/frameworks/tkinter/widgets/base.js      | 13 +++++++++++++
 src/frameworks/tkinter/widgets/frame.js     |  7 +++++--
 6 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/frameworks/customtk/constants/cursor.js b/src/frameworks/customtk/constants/cursor.js
index 64a4e41..d7a022e 100644
--- a/src/frameworks/customtk/constants/cursor.js
+++ b/src/frameworks/customtk/constants/cursor.js
@@ -2,6 +2,7 @@
 
 export const Tkinter_TO_WEB_CURSOR_MAPPING = {
     
+    "": "",
     "arrow": "default",
     "circle": "wait",
     "clock": "wait",
diff --git a/src/frameworks/customtk/widgets/base.js b/src/frameworks/customtk/widgets/base.js
index 41a50a1..4f5d5ac 100644
--- a/src/frameworks/customtk/widgets/base.js
+++ b/src/frameworks/customtk/widgets/base.js
@@ -889,6 +889,18 @@ export class CustomTkBase extends Widget {
 
     }
 
+    getToolbarAttrs(){
+        const {layout, gridConfig, gridWeights, ...toolBarAttrs} = super.getToolbarAttrs()
+
+        // places layout at the end
+        return ({
+            id: this.__id,
+            ...toolBarAttrs,
+            layout,
+            gridConfig,
+            gridWeights
+        })
+    }
 
     serialize(){
         return ({
diff --git a/src/frameworks/customtk/widgets/frame.js b/src/frameworks/customtk/widgets/frame.js
index 59e4407..760f887 100644
--- a/src/frameworks/customtk/widgets/frame.js
+++ b/src/frameworks/customtk/widgets/frame.js
@@ -162,16 +162,19 @@ class Frame extends CustomTkBase{
     }
 
     getToolbarAttrs(){
-        const {layout, ...toolBarAttrs} = super.getToolbarAttrs()
+        const {layout, gridConfig, gridWeights, ...toolBarAttrs} = super.getToolbarAttrs()
+
         // places layout at the end
         return ({
             id: this.__id,
             ...toolBarAttrs,
             padding: this.state.attrs.padding,
             margin: this.state.attrs.margin,
-            layout
+            layout,
+            gridConfig,
+            gridWeights
         })
-    } 
+    }
     
     renderContent(){
         // console.log("bounding rect: ", this.getBoundingRect())
diff --git a/src/frameworks/tkinter/constants/cursor.js b/src/frameworks/tkinter/constants/cursor.js
index 64a4e41..d7a022e 100644
--- a/src/frameworks/tkinter/constants/cursor.js
+++ b/src/frameworks/tkinter/constants/cursor.js
@@ -2,6 +2,7 @@
 
 export const Tkinter_TO_WEB_CURSOR_MAPPING = {
     
+    "": "",
     "arrow": "default",
     "circle": "wait",
     "clock": "wait",
diff --git a/src/frameworks/tkinter/widgets/base.js b/src/frameworks/tkinter/widgets/base.js
index 4dd1639..660efeb 100644
--- a/src/frameworks/tkinter/widgets/base.js
+++ b/src/frameworks/tkinter/widgets/base.js
@@ -890,6 +890,19 @@ export class TkinterBase extends Widget {
     }
 
 
+    getToolbarAttrs(){
+        const {layout, gridConfig, gridWeights, ...toolBarAttrs} = super.getToolbarAttrs()
+
+        // places layout at the end
+        return ({
+            id: this.__id,
+            ...toolBarAttrs,
+            layout,
+            gridConfig,
+            gridWeights
+        })
+    }
+
     serialize(){
         return ({
             ...super.serialize(),
diff --git a/src/frameworks/tkinter/widgets/frame.js b/src/frameworks/tkinter/widgets/frame.js
index 22f7ded..1f0f7d8 100644
--- a/src/frameworks/tkinter/widgets/frame.js
+++ b/src/frameworks/tkinter/widgets/frame.js
@@ -162,14 +162,17 @@ class Frame extends TkinterBase{
     }
 
     getToolbarAttrs(){
-        const {layout, ...toolBarAttrs} = super.getToolbarAttrs()
+        const {layout, gridConfig, gridWeights, ...toolBarAttrs} = super.getToolbarAttrs()
+
         // places layout at the end
         return ({
             id: this.__id,
             ...toolBarAttrs,
             padding: this.state.attrs.padding,
             margin: this.state.attrs.margin,
-            layout
+            layout,
+            gridConfig,
+            gridWeights
         })
     }