akkartik/pothi.love - Change OF4P6TYQA7SUF4N2KPDN7LRTIRNXME2IZJHRLFGF3EMDTWZSGOYAC

start rendering the initialized thread

This required a little more restructuring of Global_state. It's not flat now, it's hierarchical again, but in a different way.

after commit 3d89b8eb9d: post - reply A - reply B - reply C

after commit f9f7dab9b7: post reply A reply B reply C

after this commit: row - col - indent 0 - post - col - indent 1 - reply A - col - indent 2 - reply B - col - indent 1 - reply C

The indents are just invisible rectangles of different widths with 0 height.

One change I had to make was to initialize_editor. Neither luaML and driver load lines from disk, but that's arguably the common scenario to support.

Created by Kartik K. Agaram on June 20, 2023

OF4P6TYQA7SUF4N2KPDN7LRTIRNXME2IZJHRLFGF3EMDTWZSGOYAC

Dependencies

In channels

main

Change contents

File deletion: 0077-new_definition, 0066-new_definition

BF:BFD[3.2] → [4.2333:2376]

BF:BFD[4.2376] → [5.17854:17854]

BFD:BFD[3.2] → [5.18226:18269]

BF:BFD[5.18269] → [5.17854:17854]

B:BD[5.17854] → [5.17855:18049]

∅:D[6.861] → [5.18083:18222]

B:BD[5.18083] → [5.18083:18222]

B:BD[5.18222] → [6.862:866]

B:BD[5.18049] → [6.789:861]

new_definition = function()
	if Cursor_node then
		Cursor_node.show_cursor = false
	end
	table.insert(Definitions, {
		type='text',
		data={''},
		x=Spawn_point.x, y=Spawn_point.y,
		width=600,
	})
	Viewport.x = Spawn_point.x-30
	Viewport.y = Spawn_point.y-30
	Cursor_node = Definitions[#Definitions]
	Cursor_node.show_cursor = true
end
		bg=Border_color,  -- TODO: bg isn't accurate if obj.drawmode = 'line'

File deletion: 0115-update_font_size

BF:BFD[3.2] → [7.2850:2895]

BF:BFD[7.2895] → [7.2515:2515]

B:BD[7.2515] → [7.2516:2768]

∅:D[2.770] → [7.2840:2845]

B:BD[7.2840] → [7.2840:2845]

B:BD[7.2845] → [2.771:774]

B:BD[7.2768] → [2.652:770]

update_font_size = function(n)
	Font_height = n
	love.graphics.setFont(love.graphics.newFont(Font_height))
	local font = love.graphics.getFont()
	font:setLineHeight(1.3)
	Line_height = math.floor(Font_height*1.3)
	Menu_bar_height = 5 + Line_height + 5
	end
end
	if Global_state.items then
		for _,item in ipairs(Global_state.items) do
			edit.update_font_settings(item, n)
		end

File deletion: 0032-Definitions, 0012-Definitions
BF:BFD[3.2] → [4.4563:4603]
BF:BFD[4.4603] → [5.33379:33379]
BFD:BFD[3.2] → [5.33463:33503]
BF:BFD[5.33503] → [5.33379:33379]
B:BD[5.33379] → [5.33380:33462]
```
Definitions = {
	-- table mapping names to boxes where we edit their definitions
}
```
File addition: 0125-Width (----------)
[3.2]
```
Width = 600
```

File addition: 0124-Indent (----------)

[3.2]

Indent = 20  -- number of pixels to indent replies by

Insertion in 0120-initialize_item at line 8 [7.384]
[2.244]
[2.244]
```
	result.type = 'text'
	result.width = Width
```

Replacement in 0118-load_subtree at line 4 [7.1091]

B:BD[7.1227] → [2.359:424]

	local item = initialize_item(filename)
	table.insert(out, item)

[7.1227]

[2.424]

	local item = initialize_item(filename, depth)
	-- every item is a row consisting of two columns:
	-- one column of padding and another of text
	local row = cols()
	table.insert(row.data,
		{type='rectangle', w=depth*Indent, h=0})
	table.insert(row.data, item)
	table.insert(out, row)

Replacement in 0117-open_thread at line 2 [7.1551]

B:BD[7.1585] → [2.531:600]

	Global_state.items = {}
	load_subtree(filename, Global_state.items)

[7.1585]

[2.600]

	Global_state.root = rows()
	load_subtree(filename, Global_state.root.data, 0)

Insertion in 0117-open_thread at line 5 [7.1551]
[2.649]
[7.1951]
```
	A()
```
Replacement in 0028-A at line 4 [5.2646]
B:BD[5.2820] → [5.2820:2857]
```
	-- translate Definitions to Surface
```
[5.2820]
[5.2857]
```
	-- translate Global_state.root to Surface
```

Replacement in 0028-A at line 6 [5.2646]

B:BD[5.2871] → [8.594:633]

∅:D[8.650] → [5.2908:2996]

B:BD[5.2908] → [5.2908:2996]

	for key,node in pairs(Definitions) do
		compute_layout(node, node.x,node.y, Surface, preserve_screen_top_of_cursor_node)
	end

[5.2871]

[5.2996]

	compute_layout(Global_state.root, 0,0, Surface, preserve_screen_top_of_cursor_node)

Replacement in 0026-on.draw at line 3 [9.238692]

B:BD[7.5083] → [7.5083:5146]

B:BD[7.5146] → [2.804:839]

	local font = love.graphics.getFont()
	font:setLineHeight(1.3)
	if Global_state.items == nil then

[7.5083]

[7.5180]

	if Global_state.root == nil then

Replacement in 0026-on.draw at line 9 [9.238692]
B:BD[5.8189] → [6.1105:1108]
```
end
```
[9.241398]
```
end
```
Insertion in 0012-on.initialize at line 2 [10.2104]
[10.2132]
[7.5285]
```
	local font = love.graphics.getFont()
	font:setLineHeight(1.3)
```
Replacement in 0012-on.initialize at line 11 [10.2104]
∅:D[7.5485] → [11.505:528]
B:BD[10.2132] → [11.505:528]
∅:D[11.528] → [10.2137:2140]
∅:D[5.9454] → [10.2137:2140]
B:BD[10.2137] → [10.2137:2140]
```
	new_definition()
	A()
end
```
[7.5485]
```
end
```
Replacement in 0010-initialize_editor at line 7 [13.542]
∅:D[12.1335] → [13.859:901]
∅:D[5.25523] → [13.859:901]
B:BD[13.859] → [13.859:901]
```
		obj.editor.lines = load_array(obj.data)
```
[5.25394]
[13.901]
```
		obj.editor.lines = obj.data
```
Replacement in 0009-on.code_change at line 3 [14.13874]
B:BD[14.13927] → [5.12357:12362]
```
	A()
```
[14.13927]
[14.13964]
```
	if Global_state.root then
		A()
	end
```
Replacement in 0006-on.mouse_press at line 5 [15.703]
B:BD[5.13289] → [2.859:887]
```
	if Global_state.items then
```
[5.13289]
[7.5605]
```
	if Global_state.root then
```

start rendering the initialized thread

Dependencies

In channels

Change contents

File deletion: 0077-new_definition, 0066-new_definition

File deletion: 0115-update_font_size

File deletion: 0032-Definitions, 0012-Definitions

File addition: 0125-Width (----------)

File addition: 0124-Indent (----------)

Insertion in 0120-initialize_item at line 8 [7.384]

Replacement in 0118-load_subtree at line 4 [7.1091]

Replacement in 0117-open_thread at line 2 [7.1551]

Insertion in 0117-open_thread at line 5 [7.1551]

Replacement in 0028-A at line 4 [5.2646]

Replacement in 0028-A at line 6 [5.2646]

Replacement in 0026-on.draw at line 3 [9.238692]

Replacement in 0026-on.draw at line 9 [9.238692]

Insertion in 0012-on.initialize at line 2 [10.2104]

Replacement in 0012-on.initialize at line 11 [10.2104]

Replacement in 0010-initialize_editor at line 7 [13.542]

Replacement in 0009-on.code_change at line 3 [14.13874]

Replacement in 0006-on.mouse_press at line 5 [15.703]