FIX: use screen offset when drawing widget

qtxie · Aug 26, 2023 · 800ef46 · 800ef46
1 parent 26ddb8b
commit 800ef46
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/modules/view/backends/terminal/definitions.reds b/modules/view/backends/terminal/definitions.reds
@@ -79,6 +79,8 @@ ROUNDED_RECT_F!: alias struct! [
 #define TEXT_WRAP_FLAG	 		20h
 
 render-func!: alias function! [
+	x		[integer!]
+	y		[integer!]
 	widget	[widget!]
 ]
 

diff --git a/modules/view/backends/terminal/screen.reds b/modules/view/backends/terminal/screen.reds
@@ -170,15 +170,16 @@ screen: context [
 	render-widget: func [
 		widget	[widget!]
 		/local
-			sym [integer!]
 			p	[red-block!]
 			obj [red-object!]
 			end [red-object!]
+			x y [integer!]
 	][
 		if widget/flags and WIDGET_FLAG_HIDDEN <> 0 [exit]
 
-		sym: WIDGET_TYPE(widget)
-		widget/render widget
+		x: 0 y: 0
+		_widget/to-screen-pt widget :x :y
+		widget/render x y widget
 
 		p: CHILD_WIDGET(widget)
 		if TYPE_OF(p) = TYPE_BLOCK [

diff --git a/modules/view/backends/terminal/widget.reds b/modules/view/backends/terminal/widget.reds
@@ -28,6 +28,8 @@ _widget: context [
 	]
 
 	default-render-func: func [
+		x			[integer!]
+		y			[integer!]
 		widget		[widget!]
 	][
 		0
@@ -73,6 +75,25 @@ _widget: context [
 		y/value: as-integer g/box/top
 	]
 
+	to-screen-pt: func [
+		widget		[widget!]
+		p-x			[int-ptr!]
+		p-y			[int-ptr!]
+		/local
+			x		[float32!]
+			y		[float32!]
+	][
+		x: F32_0
+		y: F32_0
+		while [all [widget <> null widget/type <> window]][ ;-- window is always full screen
+			x: x + widget/box/left
+			y: y + widget/box/top
+			widget: widget/parent
+		]
+		p-x/value: as-integer x
+		p-y/value: as-integer y
+	]
+
 	find-child: func [
 		widget	[widget!]
 		x		[float32!]
@@ -153,6 +174,8 @@ _widget: context [
 	]
 
 	render-text: func [
+		x		[integer!]
+		y		[integer!]
 		widget	[widget!]
 		flags	[integer!]
 		/local
@@ -165,7 +188,7 @@ _widget: context [
 			p		[pixel!]
 			end		[pixel!]
 			n cnt	[integer!]
-			x y w h	[integer!]
+			w h		[integer!]
 			fg bg	[integer!]
 	][
 		values: get-face-values widget
@@ -183,8 +206,7 @@ _widget: context [
 			fg: true-color << 24 or get-font-color font
 		]
 
-		x: 0 y: 0 w: 0 h: 0
-		_widget/get-offset widget :x :y
+		w: 0 h: 0
 		_widget/get-size widget :w :h
 
 		p: screen/buffer + (screen/width * y + x)

diff --git a/modules/view/backends/terminal/widgets/button.reds b/modules/view/backends/terminal/widgets/button.reds
@@ -41,6 +41,8 @@ on-button-event: func [
 ]
 
 draw-button: func [
+	x			[integer!]
+	y			[integer!]
 	widget		[widget!]
 	/local
 		flags	[integer!]
@@ -49,5 +51,5 @@ draw-button: func [
 	if WIDGET_FOCUSED?(widget) [
 		flags: flags or PIXEL_INVERTED
 	]
-	_widget/render-text widget flags
+	_widget/render-text x y widget flags
 ]
diff --git a/modules/view/backends/terminal/widgets/field.reds b/modules/view/backends/terminal/widgets/field.reds
@@ -149,15 +149,14 @@ on-field-edit: func [
 ]
 
 draw-field: func [
+	x			[integer!]
+	y			[integer!]
 	widget		[widget!]
 	/local
-		x y		[integer!]
 		field	[field-data!]
 ][
-	_widget/render-text widget 0
+	_widget/render-text x y widget 0
 	if WIDGET_FOCUSED?(widget) [
-		x: 0 y: 0
-		_widget/get-offset widget :x :y
 		field: as field-data! widget/data
 		screen/cursor-x: x + field/cursor
 		screen/cursor-y: y

diff --git a/modules/view/backends/terminal/widgets/text.reds b/modules/view/backends/terminal/widgets/text.reds
@@ -17,7 +17,9 @@ init-text: func [
 ]
 
 draw-text: func [
+	x			[integer!]
+	y			[integer!]
 	widget		[widget!]
 ][
-	_widget/render-text widget 0
+	_widget/render-text x y widget 0
 ]