akkartik/sokoban.love - Change AZMYKWMHE3RTQ7Z7NTBK3H4YTZ46HQE2GHUY7WADMITC7UIVB5RQC

resolve conflicts

Created by akkartik on January 22, 2024

AZMYKWMHE3RTQ7Z7NTBK3H4YTZ46HQE2GHUY7WADMITC7UIVB5RQC

Dependencies

In channels

main

Change contents

Replacement in text.lua at line 21 [13.1]

B:BD[12.153] → [12.153:239]

    love.graphics.print(line_index, State.left-Line_number_width*App.width('m')+10,y)

[12.153]

[12.239]

    love.graphics.print(line_index, State.left-Line_number_width*State.font:getWidth('m')+10,y)

Replacement in text.lua at line 82 [13.1]
B:BD[14.3989] → [14.3989:4019]
```
        x = x+App.width(frag)
```
[14.3989]
[14.4019]
```
        x = x+State.font:getWidth(frag)
```
Resurrecting zombie bytes in select.lua at line 64 [17.43980]
B:B[15.897] → [16.6:38]
BD:B[15.897] → [16.6:38]
```
    App.color(Foreground_color)
```

Insertion in select.lua at line 64 [17.43980]

[18.152]

[16.6]

    love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)

Deletion in select.lua at line 66 [17.43980]
B:BD[18.152] → [11.4505:4594]
BD:BD[18.152] → [11.4505:4594]
```
    love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)
```
Solving an order conflict in select.lua at line 66 [17.43980]
[16.38]
[19.292]

Replacement in edit.lua at line 411 [21.413]

B:BD[20.10420] → [20.10420:10475]

function edit.update_font_settings(State, font_height)

[20.10420]

[20.10475]

function edit.update_font_settings(State, font_height, font)

Replacement in edit.lua at line 413 [21.413]

B:BD[20.10509] → [22.1640:1696]

  State.font = love.graphics.newFont(State.font_height)

[20.10509]

[20.10575]

  State.font = font or love.graphics.newFont(State.font_height)

Replacement in 0142-right_justified_button at line 2 [23.1]
B:BD[23.58] → [4.96:123]
```
	local w = App.width(name)
```
[23.58]
[23.91]
```
	local w = Font:getWidth(name)
```
Replacement in 0142-right_justified_button at line 6 [23.1]
∅:D[4.174] → [23.163:166]
B:BD[23.163] → [23.163:166]
```
end
```
[4.174]
```
end
```

Replacement in 0140-refresh_file_dialog_input_start at line 5 [24.231]

B:BD[24.389] → [4.175:234]

		if App.width(s) < File_dialog_input_right_margin-15 then

[24.389]

[24.441]

		if Font:getWidth(s) < File_dialog_input_right_margin-15 then

Replacement in 0140-refresh_file_dialog_input_start at line 11 [24.231]
B:BD[24.569] → [24.569:572]
```
end
```
[24.569]
```
end
```
Replacement in 0128-draw_file_dialog_input at line 5 [24.2247]
∅:D[25.116] → [24.2437:2489]
B:BD[24.2437] → [24.2437:2489]
```
	local w = App.width(File_dialog_input_draw_suffix)
```
[25.116]
[25.117]
```
	local w = Font:getWidth(File_dialog_input_draw_suffix)
```
Replacement in 0128-draw_file_dialog_input at line 7 [24.2247]
∅:D[25.198] → [24.2569:2572]
B:BD[24.2569] → [24.2569:2572]
```
end
```
[25.198]
```
end
```
Replacement in 0124-styled_button at line 2 [26.1]
B:BD[26.49] → [26.49:79]
```
	local w = App.width(name)+10
```
[26.49]
[26.79]
```
	local w = Font:getWidth(name)+10
```
Replacement in 0124-styled_button at line 21 [26.1]
B:BD[26.346] → [27.0:3]
```
end
```
[26.346]
```
end
```
Replacement in 0119-draw_file_dialog at line 37 [28.1606]
B:BD[3.94] → [3.94:132]
```
			local w = App.width(filename) + 10
```
[3.94]
[3.132]
```
			local w = Font:getWidth(filename) + 10
```
Replacement in 0119-draw_file_dialog at line 52 [28.1606]
B:BD[28.2377] → [28.2377:2380]
```
end
```
[28.2377]
```
end
```
Replacement in 0118-overflowable_button at line 4 [30.49]
∅:D[29.121] → [30.106:136]
B:BD[30.106] → [30.106:136]
```
	local w = App.width(name)+10
```
[29.121]
[29.122]
```
	local w = Font:getWidth(name)+10
```
Replacement in 0110-maybe_draw_overflow_button at line 5 [31.1]
B:BD[31.155] → [31.155:187]
```
		local w2 = App.width('>>')+10
```
[31.155]
[31.187]
```
		local w2 = Font:getWidth('>>')+10
```
Replacement in 0106-stop_button at line 10 [32.41]
∅:D[27.250] → [32.68:100]
∅:D[26.654] → [32.68:100]
∅:D[31.1362] → [32.68:100]
B:BD[32.68] → [32.68:100]
```
	local w = App.width('stop')+10
```
[27.250]
[31.1451]
```
	local w = Font:getWidth('stop')+10
```
Replacement in 0106-stop_button at line 12 [32.41]
B:BD[31.1469] → [7.57:60]
```
end
```
[31.1469]
```
end
```

Replacement in 0081-draw_settings_menu at line 11 [33.2995]

B:BD[33.3353] → [33.3353:3408]

	local sx = x+App.width('bg')+50  -- align all sliders

[33.3353]

[5.744]

	local sx = x+Font:getWidth('bg')+50  -- align all sliders

Replacement in 0081-draw_settings_menu at line 63 [33.2995]
∅:D[5.1312] → [33.5309:5312]
B:BD[33.5309] → [33.5309:5312]
```
end
```
[5.1312]
```
end
```

Replacement in 0070-code_editor_state at line 6 [34.2519]

B:BD[34.2710] → [34.2710:2772]

			math.min(100+30*App.width('m'), Safe_width*2/3),  -- right

[34.2710]

[8.195]

			math.min(100+30*Font:getWidth('m'), Safe_width*2/3),  -- right

Replacement in 0070-code_editor_state at line 10 [34.2519]
B:BD[34.2865] → [34.2865:2868]
```
end
```
[34.2865]
```
end
```
Replacement in 0051-run_button at line 29 [35.1]
B:BD[26.812] → [26.812:843]
```
	local w = App.width('run')+10
```
[26.812]
[31.4068]
```
	local w = Font:getWidth('run')+10
```
Replacement in 0051-run_button at line 31 [35.1]
B:BD[31.4086] → [6.216:219]
```
end
```
[31.4086]
```
end
```
Replacement in 0032-update_font_settings at line 6 [37.50]
∅:D[36.978] → [37.222:278]
B:BD[37.222] → [37.222:278]
```
	Line_number_padding = Line_number_width*App.width('m')
```
[38.72]
[37.278]
```
	Line_number_padding = Line_number_width*Font:getWidth('m')
```

Replacement in 0032-update_font_settings at line 12 [37.50]

B:BD[16.863] → [16.863:939]

		pane.editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)

[16.863]

[2.193]

		pane.editor_state.right = math.min(100+30*Font:getWidth('m'), Safe_width*2/3)

Replacement in 0032-update_font_settings at line 17 [37.50]

B:BD[16.1016] → [9.176:236]

		edit.update_font_settings(pane.editor_state, Font_height)

[16.1016]

[16.1076]

		edit.update_font_settings(pane.editor_state, Font_height, Font)

Replacement in 0032-update_font_settings at line 19 [37.50]

B:BD[16.1113] → [9.237:304]

		edit.update_font_settings(pane.output_editor_state, Font_height)

[16.1113]

[39.367]

		edit.update_font_settings(pane.output_editor_state, Font_height, Font)

Replacement in 0032-update_font_settings at line 22 [37.50]
∅:D[40.697] → [37.662:665]
∅:D[16.1118] → [37.662:665]
B:BD[37.662] → [37.662:665]
```
end
```
[16.1118]
```
end
```

Replacement in 0031-on.resize at line 4 [42.1]

B:BD[41.121] → [41.121:197]

		pane.editor_state.right = math.min(100+30*App.width('m'), Safe_width*2/3)

[41.121]

[2.313]

		pane.editor_state.right = math.min(100+30*pane.font:getWidth('m'), Safe_width*2/3)

Replacement in 0031-on.resize at line 13 [42.1]
∅:D[41.596] → [42.246:249]
∅:D[40.1264] → [42.246:249]
∅:D[43.1575] → [42.246:249]
B:BD[42.246] → [42.246:249]
```
end
```
[41.596]
```
end
```
Replacement in 0021-draw_menu at line 12 [44.704]
∅:D[33.5743] → [34.7781:7837]
B:BD[34.7781] → [34.7781:7837]
```
	x = x+5 + App.width(tostring(Current_pane_index)) + 10
```
[33.5743]
[45.144]
```
	x = x+5 + Font:getWidth(tostring(Current_pane_index)) + 10
```

Replacement in 0021-draw_menu at line 17 [44.704]

B:BD[46.313] → [46.313:378]

		local w = App.width('code')+10
		local w2 = App.width('>>')+10

[46.313]

[46.378]

		local w = Font:getWidth('code')+10
		local w2 = Font:getWidth('>>')+10

Replacement in 0021-draw_menu at line 36 [44.704]

B:BD[31.4651] → [31.4651:4718]

		local w = App.width('screen')+10
		local w2 = App.width('>>')+10

[31.4651]

[31.4718]

		local w = Font:getWidth('screen')+10
		local w2 = Font:getWidth('>>')+10

Replacement in 0021-draw_menu at line 56 [44.704]
B:BD[33.5795] → [10.172:175]
```
end
```
[33.5795]
```
end
```
Replacement in 0011-on.initialize at line 10 [14.3075]
∅:D[36.1100] → [14.3220:3276]
B:BD[14.3220] → [14.3220:3276]
```
	Line_number_padding = Line_number_width*App.width('m')
```
[36.1100]
[42.447]
```
	Line_number_padding = Line_number_width*Font:getWidth('m')
```

resolve conflicts

Dependencies

In channels

Change contents

Replacement in text.lua at line 21 [13.1]

Replacement in text.lua at line 82 [13.1]

Resurrecting zombie bytes in select.lua at line 64 [17.43980]

Insertion in select.lua at line 64 [17.43980]

Deletion in select.lua at line 66 [17.43980]

Solving an order conflict in select.lua at line 66 [17.43980]

Replacement in edit.lua at line 411 [21.413]

Replacement in edit.lua at line 413 [21.413]

Replacement in 0142-right_justified_button at line 2 [23.1]

Replacement in 0142-right_justified_button at line 6 [23.1]

Replacement in 0140-refresh_file_dialog_input_start at line 5 [24.231]

Replacement in 0140-refresh_file_dialog_input_start at line 11 [24.231]

Replacement in 0128-draw_file_dialog_input at line 5 [24.2247]

Replacement in 0128-draw_file_dialog_input at line 7 [24.2247]

Replacement in 0124-styled_button at line 2 [26.1]

Replacement in 0124-styled_button at line 21 [26.1]

Replacement in 0119-draw_file_dialog at line 37 [28.1606]

Replacement in 0119-draw_file_dialog at line 52 [28.1606]

Replacement in 0118-overflowable_button at line 4 [30.49]

Replacement in 0110-maybe_draw_overflow_button at line 5 [31.1]

Replacement in 0106-stop_button at line 10 [32.41]

Replacement in 0106-stop_button at line 12 [32.41]

Replacement in 0081-draw_settings_menu at line 11 [33.2995]

Replacement in 0081-draw_settings_menu at line 63 [33.2995]

Replacement in 0070-code_editor_state at line 6 [34.2519]

Replacement in 0070-code_editor_state at line 10 [34.2519]

Replacement in 0051-run_button at line 29 [35.1]

Replacement in 0051-run_button at line 31 [35.1]

Replacement in 0032-update_font_settings at line 6 [37.50]

Replacement in 0032-update_font_settings at line 12 [37.50]

Replacement in 0032-update_font_settings at line 17 [37.50]

Replacement in 0032-update_font_settings at line 19 [37.50]

Replacement in 0032-update_font_settings at line 22 [37.50]

Replacement in 0031-on.resize at line 4 [42.1]

Replacement in 0031-on.resize at line 13 [42.1]

Replacement in 0021-draw_menu at line 12 [44.704]

Replacement in 0021-draw_menu at line 17 [44.704]

Replacement in 0021-draw_menu at line 36 [44.704]

Replacement in 0021-draw_menu at line 56 [44.704]

Replacement in 0011-on.initialize at line 10 [14.3075]