Miko/PyUIBuilder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed code engine bugs

Browse Source
This commit is contained in:
paul
2025-03-10 10:37:57 +05:30
parent d1ef2fa3f8
commit 16bfd244e6
7 changed files with 19 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/canvas/canvas.js
View File

@@ -708,6 +708,7 @@ class Canvas extends React.Component {
x: (clientX - canvasRect.left) / this.state.zoom,
y: (clientY - canvasRect.top) / this.state.zoom,
}
// console.log("Final position1: ", finalPosition, container)
if (container === WidgetContainer.SIDEBAR) {
@@ -734,23 +735,12 @@ class Canvas extends React.Component {
const canvasBoundingRect = this.getCanvasBoundingRect()
// calculate the initial offset from the div to the cursor grab
// const initialOffset = {
// x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom - this.state.currentTranslate.x) - initialPos.x,
// y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom - this.state.currentTranslate.y) - initialPos.y
// }
const initialOffset = {
x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom) - (initialPos.x/this.state.zoom),
y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom) - (initialPos.y/this.state.zoom)
x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom) - (initialPos.x / this.state.zoom),
y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom) - (initialPos.y / this.state.zoom)
}
console.log("initial offset:")
// finalPosition = {
// x: finalPosition.x - initialOffset.x - this.state.currentTranslate.x,
// y: finalPosition.y - initialOffset.y - this.state.currentTranslate.y
// }
finalPosition = {
x: finalPosition.x - initialOffset.x,
y: finalPosition.y - initialOffset.y
@@ -921,46 +911,20 @@ class Canvas extends React.Component {
const { dragStartCursorPos, initialPos } = posMetaData
const canvasBoundingRect = this.getCanvasBoundingRect()
// TODO: the final position isn't adjusted for cursorpos
let finalPosition = {
x: (clientX - parentRect.left) / this.state.zoom,
y: (clientY - parentRect.top) / this.state.zoom,
}
// finalPosition = {
// x: finalPosition.x - parentRect.left - this.state.currentTranslate.x,
// y: finalPosition.y - parentRect.right - this.state.currentTranslate.y
// }
// const initialOffset = {
// x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom - this.state.currentTranslate.x) - initialPos.x,
// y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom - this.state.currentTranslate.y) - initialPos.y
// }
// TODO: add offset to get the cursor to the correct div
// const initialOffset = {
// x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom - this.state.currentTranslate.x) - initialPos.x,
// y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom - this.state.currentTranslate.y) - initialPos.y
// }
// FIXME: if the drag is from sidebar in layout absolute the position is wrong
const initialOffset = {
x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom) - (initialPos.x/this.state.zoom),
y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom) - (initialPos.y/this.state.zoom)
x: ((dragStartCursorPos.x - canvasBoundingRect.left) / this.state.zoom) - (initialPos.x / this.state.zoom),
y: ((dragStartCursorPos.y - canvasBoundingRect.top) / this.state.zoom) - (initialPos.y / this.state.zoom)
}
// finalPosition = {
// x: finalPosition.x - initialOffset.x - this.state.currentTranslate.x,
// y: finalPosition.y - initialOffset.y - this.state.currentTranslate.y
// }
// finalPosition = {
// x: (finalPosition.x - parentRect.left) / this.state.zoom,
// y: (finalPosition.y - parentRect.top) / this.state.zoom
// };
finalPosition = {
x: finalPosition.x - initialOffset.x,
y: finalPosition.y - initialOffset.y
@@ -1052,8 +1016,6 @@ class Canvas extends React.Component {
// Store the ref in the instance variable
this.widgetRefs.current[id] = widgetRef
console.log("widget ref: ", widgetRef)
// this.setWidgetRefs({...this.widgetRefs.current, [id]: widgetRef})
const newWidget = {

2
src/components/cards.js
View File

@@ -184,7 +184,7 @@ export const TreeViewCard = memo(({widgetRef, title, isTopLevel}) => {
<Button color="danger" title="delete" onClick={onDelete} size="small" variant="text" danger
icon={<DeleteOutlined />}></Button>
<Button variant="text" type="text" title="hide" onClick={toggleHideShowWidget} size="small"
icon={widgetVisible ? <EyeInvisibleOutlined/> : <EyeOutlined />}></Button>
icon={widgetVisible ? <EyeOutlined /> : <EyeInvisibleOutlined/>}></Button>
</div>
</div>
)

2
src/frameworks/customtk/engine/code.js
View File

@@ -111,7 +111,7 @@ async function generateCustomTkCode(projectName, widgetList=[], widgetRefs=[], a
// widget - {id, widgetType: widgetComponentType, children: [], parent: "", initialData: {}}
const generatedObject = generateCustomTkCodeList(filteredWidgetList, widgetRefs, "", "")
const generatedObject = generateCustomTkCodeList(filteredWidgetList, widgetRefs.current, "", "")
const {code: codeLines, imports, requirements, mainVariable} = generatedObject

8
src/frameworks/customtk/widgets/base.js
View File

@@ -30,12 +30,12 @@ export class CustomTkBase extends Widget {
if (parentLayout === Layouts.PLACE || absolutePositioning){
const config = {
x: this.state.pos.x,
y: this.state.pos.y,
x: Math.trunc(this.state.pos.x),
y: Math.trunc(this.state.pos.y),
}
config["width"] = this.state.size.width
config["height"] = this.state.size.height
config["width"] = Math.trunc(this.state.size.width)
config["height"] = Math.trunc(this.state.size.height)
// if (!this.state.fitContent.width){
// config["width"] = this.state.size.width

2
src/frameworks/tkinter/engine/code.js
View File

@@ -111,7 +111,7 @@ async function generateTkinterCode(projectName, widgetList=[], widgetRefs=[], as
// widget - {id, widgetType: widgetComponentType, children: [], parent: "", initialData: {}}
const generatedObject = generateTkinterCodeList(filteredWidgetList, widgetRefs, "", "")
const generatedObject = generateTkinterCodeList(filteredWidgetList, widgetRefs.current, "", "")
const {code: codeLines, imports, requirements, mainVariable} = generatedObject

8
src/frameworks/tkinter/widgets/base.js
View File

@@ -28,12 +28,12 @@ export class TkinterBase extends Widget {
if (parentLayout === Layouts.PLACE || absolutePositioning){
const config = {
x: this.state.pos.x,
y: this.state.pos.y,
x: Math.trunc(this.state.pos.x),
y: Math.trunc(this.state.pos.y),
}
config["width"] = this.state.size.width
config["height"] = this.state.size.height
config["width"] = Math.trunc(this.state.size.width)
config["height"] = Math.trunc(this.state.size.height)
// if (!this.state.fitContent.width){
// config["width"] = this.state.size.width

3
src/sidebar/treeviewContainer.js
View File

@@ -50,7 +50,8 @@ function TreeviewContainer() {
onClear={() => setSearchValue("")} /> */}
<div className="tw-flex tw-flex-col tw-gap-2 tw-w-full tw-h-full tw-p-1">
<Tree treeData={transformedContent}
<Tree showLine
treeData={transformedContent}
titleRender={(nodeData) =>
<TreeViewCard widgetId={nodeData.id} title={nodeData.title}