akkartik/sokoban.love - Change 5MEJ7XNHNFG2BIX3TFU6PDJHSJOS2Z45L25QAZKFGRW7ZNOFEUKAC

lay out buttons based on device dimensions

Created by akkartik on November 22, 2023

5MEJ7XNHNFG2BIX3TFU6PDJHSJOS2Z45L25QAZKFGRW7ZNOFEUKAC

Dependencies

In channels

main

Change contents

File addition: 0110-maybe_draw_overflow_button (----------)

[4.2]

maybe_draw_overflow_button = function(x, y, w, r, final_button)
	if Overflow_button then return x, y end
	local after = x+w+10
	if not final_button then
		local w2 = App.width('>>')+10
		-- only draw a button if there's going to be at least space for the overflow button afterwards
		after = after+w2+10
	end
	if after > r then
		x, y = overflow_button(x, y)
		Overflow_button = Global_state.button_handlers[#Global_state.button_handlers]
		return x, y
	else
		return x, y
	end
end

File addition: 0109-overflow_button (----------)

[4.2]

overflow_button = function(x, y)
	local w = App.width('>>')+10
	button(Global_state, 'overflow', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},
		icon = function(p)
			App.color(Normal_color)
			love.graphics.rectangle('line', p.x,p.y, p.w,p.h, 2,2)
			love.graphics.print('>>', p.x+5,p.y+2)
		end,
		onpress1 = function()
			Show_overflow = not Show_overflow
		end,
	})
	return x+w+10, y+Line_height
end

File addition: 0108-Overflow_button (----------)

[4.2]

Overflow_button = nil   -- location and dimensions of the overflow button if it's been drawn this frame

File addition: 0107-Show_overflow (----------)

[4.2]

-- True if the overflow menu has been opened and we want to render buttons within it.
Show_overflow = false

Replacement in 0106-stop_button at line 1 [3.41]
B:BD[3.41] → [3.42:68]
```
stop_button = function(x)
```
[3.41]
[3.68]
```
stop_button = function(x, y)
```

Replacement in 0106-stop_button at line 3 [3.41]

B:BD[3.100] → [3.100:196]

	button(Global_state, 'stop', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[3.100]

[3.196]

	button(Global_state, 'stop', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0106-stop_button at line 11 [3.41]
B:BD[3.386] → [3.386:401]
```
	return x+w+10
```
[3.386]
[3.401]
```
	return x+w+10, y
```
Replacement in 0076-delete_pane_button at line 1 [5.1]
B:BD[5.1] → [5.2:35]
```
delete_pane_button = function(x)
```
[5.1]
[5.35]
```
delete_pane_button = function(x, y, r)
```

Replacement in 0076-delete_pane_button at line 3 [5.1]

B:BD[5.69] → [5.69:167]

	button(Global_state, 'delete', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.69]

[5.167]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r, --[[final button]] true)
	if Overflow_button then
		-- overflow
		if Show_overflow then
			y = y2
		else
			return x, y
		end
	end
	button(Global_state, 'delete', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0076-delete_pane_button at line 29 [5.1]

B:BD[5.606] → [5.606:621]

	return x+w+10

[5.606]

[5.621]

	if Overflow_button then
		return x, y+Line_height
	else
		return x+w+10, y
	end

Replacement in 0074-clear_pane_button at line 1 [5.945]
B:BD[5.945] → [5.946:978]
```
clear_pane_button = function(x)
```
[5.945]
[5.978]
```
clear_pane_button = function(x, y, r)
```

Replacement in 0074-clear_pane_button at line 3 [5.945]

B:BD[5.1011] → [5.1011:1108]

	button(Global_state, 'clear', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.1011]

[5.1108]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r)
	if Overflow_button then
		-- overflow
		if not Show_overflow then
			return x, y
		else
			y = y2
		end
	end
	button(Global_state, 'clear', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0074-clear_pane_button at line 20 [5.945]
B:BD[5.1295] → [5.1295:1310]
```
	return x+w+10
```
[5.1295]
[5.1310]
```
	if Overflow_button then
		return x, y+Line_height
	else
		return x+w+10, y
	end
```
Replacement in 0067-paste_button at line 1 [5.3731]
B:BD[5.3731] → [5.3732:3759]
```
paste_button = function(x)
```
[5.3731]
[5.3759]
```
paste_button = function(x, y, r)
```

Replacement in 0067-paste_button at line 3 [5.3731]

B:BD[5.3792] → [5.3792:3889]

	button(Global_state, 'paste', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.3792]

[5.3889]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r)
	if Overflow_button then
		-- overflow
		if not Show_overflow then
			return x, y
		else
			y = y2
		end
	end
	button(Global_state, 'paste', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0067-paste_button at line 23 [5.3731]

B:BD[5.4165] → [5.4165:4180]

	return x+w+10

[5.4165]

[5.4180]

	if Overflow_button then
		-- we're past the overflow button; start drawing downward
		return x, y+Line_height
	else
		return x+w+10, y
	end

Replacement in 0066-copy_button at line 1 [5.4227]
B:BD[5.4227] → [5.4228:4254]
```
copy_button = function(x)
```
[5.4227]
[5.4254]
```
copy_button = function(x, y, r)
```

Replacement in 0066-copy_button at line 3 [5.4227]

B:BD[5.4286] → [5.4286:4382]

	button(Global_state, 'copy', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.4286]

[5.4382]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r)
	if Overflow_button then
		-- overflow
		if not Show_overflow then
			return x, y
		end
	end
	button(Global_state, 'copy', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0066-copy_button at line 21 [5.4227]

B:BD[5.4667] → [5.4667:4682]

	return x+w+10

[5.4667]

[5.4682]

	if Overflow_button then
		return x, y+Line_height
	else
		return x+w+10, y
	end

Replacement in 0065-hide_code_button at line 1 [5.4728]
B:BD[5.4728] → [5.4729:4760]
```
hide_code_button = function(x)
```
[5.4728]
[5.4760]
```
hide_code_button = function(x, y, r)
```

Replacement in 0065-hide_code_button at line 3 [5.4728]

B:BD[5.4792] → [5.4792:4888]

	button(Global_state, 'hide', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.4792]

[5.4888]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r)
	if Overflow_button then
		-- overflow
		if not Show_overflow then
			return x, y
		end
	end
	button(Global_state, 'hide', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0065-hide_code_button at line 20 [5.4728]
B:BD[5.5101] → [5.5101:5116]
```
	return x+w+10
```
[5.5101]
[5.5116]
```
	if Overflow_button then
		return x, y+Line_height
	else
		return x+w+10, y
	end
```
Replacement in 0064-show_code_button at line 1 [5.5167]
B:BD[5.5167] → [5.5168:5199]
```
show_code_button = function(x)
```
[5.5167]
[5.5199]
```
show_code_button = function(x, y)
```

Replacement in 0064-show_code_button at line 3 [5.5167]

B:BD[5.5231] → [5.5231:5327]

	button(Global_state, 'show', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.5231]

[5.5327]

	button(Global_state, 'show', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0064-show_code_button at line 13 [5.5167]
B:BD[5.5539] → [5.5539:5554]
```
	return x+w+10
```
[5.5539]
[5.5554]
```
	return x+w+10, y+Line_height
```
Replacement in 0061-new_pane_button at line 1 [5.5663]
B:BD[5.5663] → [5.5664:5694]
```
new_pane_button = function(x)
```
[5.5663]
[5.5694]
```
new_pane_button = function(x, y, r)
```

Replacement in 0061-new_pane_button at line 3 [5.5663]

B:BD[5.5725] → [5.5725:5820]

	button(Global_state, 'new', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[5.5725]

[5.5820]

	local x2, y2 = maybe_draw_overflow_button(x, y, w, r)
	if Overflow_button then
		-- overflow
		if not Show_overflow then
			return x, y
		else
			y = y2
		end
	end
	button(Global_state, 'new', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0061-new_pane_button at line 24 [5.5663]
B:BD[5.6155] → [5.6155:6170]
```
	return x+w+10
```
[5.6155]
[5.6170]
```
	if Overflow_button then
		return x, y+Line_height
	else
		return x+w+10, y
	end
```
Replacement in 0051-run_button at line 1 [6.1]
B:BD[6.1] → [7.31:56]
```
run_button = function(x)
```
[6.1]
[3.405]
```
run_button = function(x, y)
```

Replacement in 0051-run_button at line 3 [6.1]

∅:D[3.436] → [7.87:182]

B:BD[7.87] → [7.87:182]

	button(Global_state, 'run', {x=x, y=Menu_top+5, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

[3.436]

[6.149]

	button(Global_state, 'run', {x=x, y=y, w=w, h=Line_height, bg={r=0.6, g=0.8, b=0.6},

Replacement in 0051-run_button at line 36 [6.1]
B:BD[6.1365] → [5.7565:7580]
```
	return x+w+10
```
[6.1365]
[6.1365]
```
	return x+w+10, y
```

Replacement in 0021-draw_menu at line 4 [8.704]

B:BD[7.246] → [7.246:269]

	local x = Menu_left+5

[8.825]

[9.5699]

	-- settings button on right
	local w = App.width('settings')
	local r = Safe_width-w-10-5
	settings_button(r, w)
	local x, y = Menu_left+5, Menu_top+5
	-- main menu on left

Replacement in 0021-draw_menu at line 14 [8.704]
∅:D[7.378] → [10.746:763]
∅:D[5.7837] → [10.746:763]
B:BD[8.825] → [10.746:763]
B:BD[10.763] → [7.379:398]
B:BD[7.398] → [3.481:501]
```
	-- main buttons
	x = run_button(x)
	x = stop_button(x)
```
[5.7837]
[3.501]
```
	x = run_button(x, y, r)
	x = stop_button(x, y, r)
```
Replacement in 0021-draw_menu at line 17 [8.704]
B:BD[3.533] → [3.533:577]
```
	love.graphics.print('code', x, Menu_top+5)
```
[3.533]
[3.577]
```
	love.graphics.print('code', x, y)
```

Insertion in 0021-draw_menu at line 19 [8.704]

[3.605]

[5.7838]

	-- assume screen will always be wide enough to print this far without overflow

Replacement in 0021-draw_menu at line 21 [8.704]
B:BD[5.7857] → [5.7857:7883]
```
		x = hide_code_button(x)
```
[5.7857]
[5.7883]
```
		x, y = hide_code_button(x, y, r)
```
Replacement in 0021-draw_menu at line 23 [8.704]
B:BD[5.7889] → [5.7889:7915]
```
		x = show_code_button(x)
```
[5.7889]
[5.7915]
```
		x, y = show_code_button(x, y, r)
```

Replacement in 0021-draw_menu at line 25 [8.704]

B:BD[5.7920] → [5.7920:7961]

B:BD[5.8015] → [5.8015:8041]

B:BD[5.8041] → [3.606:738]

∅:D[3.738] → [5.8041:8068]

B:BD[5.8041] → [5.8041:8068]

∅:D[7.398] → [10.957:1019]

∅:D[6.1679] → [10.957:1019]

∅:D[5.8068] → [10.957:1019]

B:BD[10.957] → [10.957:1019]

B:BD[10.1019] → [5.8069:8108]

	x = copy_button(x)
	x = paste_button(x)
	x = clear_pane_button(x)
	App.color{r=0.5, g=0.5, b=0.5}
	love.graphics.print('screen', x, Menu_top+5)
	x = x+App.width('screen')+10
	x = new_pane_button(x)
	x = delete_pane_button(x)
	-- settings button on right
	local w = App.width('settings')
	settings_button(Safe_width-w-10-5, w)

[5.7920]

[10.1344]

	x, y = copy_button(x, y, r)
	x, y = paste_button(x, y, r)
	x, y = clear_pane_button(x, y, r)
	if not Overflow_button then
		local w = App.width('screen')+10
		local w2 = App.width('>>')+10
		if x+w+10+w2+10 < r then
			App.color{r=0.5, g=0.5, b=0.5}
			love.graphics.print('screen', x, y)
			x = x+App.width('screen')+10
		end
	end
	x, y = new_pane_button(x, y, r)
	x, y = delete_pane_button(x, y, r)

Insertion in 0016-on.mouse_press at line 5 [11.2363]
[9.5838]
[9.5838]
```
	Show_overflow = false
```
Insertion in 0012-on.draw at line 3 [11.2899]
[12.4113]
[2.44]
```
	Overflow_button = nil
```

lay out buttons based on device dimensions

Dependencies

In channels

Change contents

File addition: 0110-maybe_draw_overflow_button (----------)

File addition: 0109-overflow_button (----------)

File addition: 0108-Overflow_button (----------)

File addition: 0107-Show_overflow (----------)

Replacement in 0106-stop_button at line 1 [3.41]

Replacement in 0106-stop_button at line 3 [3.41]

Replacement in 0106-stop_button at line 11 [3.41]

Replacement in 0076-delete_pane_button at line 1 [5.1]

Replacement in 0076-delete_pane_button at line 3 [5.1]

Replacement in 0076-delete_pane_button at line 29 [5.1]

Replacement in 0074-clear_pane_button at line 1 [5.945]

Replacement in 0074-clear_pane_button at line 3 [5.945]

Replacement in 0074-clear_pane_button at line 20 [5.945]

Replacement in 0067-paste_button at line 1 [5.3731]

Replacement in 0067-paste_button at line 3 [5.3731]

Replacement in 0067-paste_button at line 23 [5.3731]

Replacement in 0066-copy_button at line 1 [5.4227]

Replacement in 0066-copy_button at line 3 [5.4227]

Replacement in 0066-copy_button at line 21 [5.4227]

Replacement in 0065-hide_code_button at line 1 [5.4728]

Replacement in 0065-hide_code_button at line 3 [5.4728]

Replacement in 0065-hide_code_button at line 20 [5.4728]

Replacement in 0064-show_code_button at line 1 [5.5167]

Replacement in 0064-show_code_button at line 3 [5.5167]

Replacement in 0064-show_code_button at line 13 [5.5167]

Replacement in 0061-new_pane_button at line 1 [5.5663]

Replacement in 0061-new_pane_button at line 3 [5.5663]

Replacement in 0061-new_pane_button at line 24 [5.5663]

Replacement in 0051-run_button at line 1 [6.1]

Replacement in 0051-run_button at line 3 [6.1]

Replacement in 0051-run_button at line 36 [6.1]

Replacement in 0021-draw_menu at line 4 [8.704]

Replacement in 0021-draw_menu at line 14 [8.704]

Replacement in 0021-draw_menu at line 17 [8.704]

Insertion in 0021-draw_menu at line 19 [8.704]

Replacement in 0021-draw_menu at line 21 [8.704]

Replacement in 0021-draw_menu at line 23 [8.704]

Replacement in 0021-draw_menu at line 25 [8.704]

Insertion in 0016-on.mouse_press at line 5 [11.2363]

Insertion in 0012-on.draw at line 3 [11.2899]