resolve conflicts

akkartik

Jan 22, 2024, 4:24 PM

AZMYKWMHE3RTQ7Z7NTBK3H4YTZ46HQE2GHUY7WADMITC7UIVB5RQC

Dependencies

[2] FQAZKPOO bugfix: infinite loop if window is too narrow
[3] 7QVNDHPE filter file list based on input
[4] E75L5QGU ok/cancel buttons in file dialog
[5] OC4P6P36 greatly simplify slider implementation
[6] PN6VP3LV escape hatch when print is overridden
[7] I27BLL75 new car.quit callback for user scripts
[8] AQZ7YIX5 resolve conflicts
[9] OTJQKAQZ bugfix: update output font (and menus)
[10] I2YECDRF decouple menu font from output buffer
[11] AQMZJXUR use editor state font for width calculations
[12] Z5M23NTK implement second, 'output' editor
[13] UUAIVZ4U 2 bugfixes in font rendering
[14] PRE6XPRN responsively increase/decrease font height
[15] JV27LDDK sliders for font size and color settings
[16] R2ASHK5C fix a bad merge
[17] UPQJIFDP hide file numbers in output editor
[18] G5ZIPHJC make it look more like a dialog
[19] ZM7NOBRM new fork: carousel shell
[20] 7RIDCIVG handle scripts that change the font
[21] SFRZIHVE bugfix: update all panes on resize
[22] 4KC7I3E2 make colors easier to edit
[23] 5MEJ7XNH lay out buttons based on device dimensions
[24] OE26XIQO bring back syntax highlighting (but so ugly)
[25] I64IPGJX avoid saving fragments in lines
[26] HIKLULFQ extract a function
[27] ISOFHXB2 App.width can no longer take a Text
[28] LGIEVJE6 activate buttons for some time
[29] FHSZYAZ2 more precise search highlighting
[30] H2DPLWMV snapshot: wrapping long lines at word boundaries
[31] MD3W5IRA new fork: rip out drawing support
[32] W3RRTO4P extract a second helper for buttons
[33] XGOKNDSU avoid the overflow button in some narrow cases
[34] MUJTM6RE bring back a level of wrapping
[35] IUOZ4YHC use the obvious name for the font global
[36] LR4HHCRH responsive layout for settings menu
[37] W4EQ6IW4 simplify state management for menus
[38] LF7BWEG4 group all editor globals
[39] HVXZLNCC send errors from event handlers to output editor
[40] X2YWEIZS bugfix: missing variable in a button
[41] V5SYDHPQ start thinking of compute_fragments as a detail
[42] OGDDLU5B close all menus when tapping any button
[43] I52S4E5F running `print` now appends to output editor
[44] YV2GBDNW preserve settings across restart
[45] RK2ASPN7 add lots of buttons to the toolbar
[46] VAVXKWZV aggregate global state inside a 'pane' object
[47] SJXIMERS type out a filename to load/save
[48] QMRQL2FO resolve conflicts
[49] SIJ5I4NZ extract a helper for buttons
[50] XJBUCJAG bugfix: skipping files near right margin
[51] IQW6KIIL bugfix: changing font size
[52] 6ARK6HWF bugfix: avoid overflowing 'delete' button in some situations
[53] S2MISTTM add state arg to a few functions
[54] VEAVIL4X resize handler
[55] FIUQJVL2 first draft of load/save buttons
[56] ICS45BIL editor widget now takes a bottom margin
[57] VQYLKEGD handle still narrower screens on phones
[58] LEE7TNZM sync all sliders with the font slider where possible
[59] FPSPT5TM show current pane number
[60] ESOJS6ZW extract a function
[61] GWLETNMW Mike's suggested button layout
[62] 5RUFNRJO start of the visual skeleton
[*] BULPIBEG beginnings of a module for the text editor
[*] LXTTOB33 extract a couple of files
[*] 2L5MEZV3 experiment: new edit namespace

Change contents

replacement in text.lua at line 21

[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

[12.3989]→[12.3989:4019](∅→∅)

x = x+App.width(frag)

[12.3989]

[12.4019]

x = x+State.font:getWidth(frag)
resurrect zombie in select.lua at line 64

[12.897]→[12.6:38](∅→∅),[12.897]→[12.6:38](∅→∅)

App.color(Foreground_color)
edit in select.lua at line 64

[12.152]

[12.6]

love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)
edit in select.lua at line 66

[12.152]→[11.4505:4594](∅→∅),[12.152]→[11.4505:4594](∅→∅)

love.graphics.rectangle('fill', x+lo_px,y, State.font:getWidth(s),State.line_height)
resolve order conflict in select.lua at line 66

[12.38]

[12.292]
replacement in edit.lua at line 411

[12.10420]→[12.10420:10475](∅→∅)

function edit.update_font_settings(State, font_height)

[12.10420]

[12.10475]

function edit.update_font_settings(State, font_height, font)
replacement in edit.lua at line 413

[12.10509]→[12.1640:1696](∅→∅)

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

[12.10509]

[12.10575]

State.font = font or love.graphics.newFont(State.font_height)
replacement in 0142-right_justified_button at line 2

[12.58]→[4.96:123](∅→∅)

local w = App.width(name)

[12.58]

[12.91]

local w = Font:getWidth(name)
replacement in 0142-right_justified_button at line 6

[4.174]→[12.163:166](∅→∅),[12.163]→[12.163:166](∅→∅)

end

[4.174]

end
replacement in 0140-refresh_file_dialog_input_start at line 5

[12.389]→[4.175:234](∅→∅)

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

[12.389]

[12.441]

if Font:getWidth(s) < File_dialog_input_right_margin-15 then
replacement in 0140-refresh_file_dialog_input_start at line 11

[12.569]→[12.569:572](∅→∅)

end

[12.569]

end
replacement in 0128-draw_file_dialog_input at line 5

[12.116]→[12.2437:2489](∅→∅),[12.2437]→[12.2437:2489](∅→∅)

local w = App.width(File_dialog_input_draw_suffix)

[12.116]

[12.117]

local w = Font:getWidth(File_dialog_input_draw_suffix)
replacement in 0128-draw_file_dialog_input at line 7

[12.198]→[12.2569:2572](∅→∅),[12.2569]→[12.2569:2572](∅→∅)

end

[12.198]

end
replacement in 0124-styled_button at line 2

[12.49]→[12.49:79](∅→∅)

local w = App.width(name)+10

[12.49]

[12.79]

local w = Font:getWidth(name)+10
replacement in 0124-styled_button at line 21

[12.346]→[12.0:3](∅→∅)

end

[12.346]

end
replacement in 0119-draw_file_dialog at line 37

[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

[12.2377]→[12.2377:2380](∅→∅)

end

[12.2377]

end
replacement in 0118-overflowable_button at line 4

[12.121]→[12.106:136](∅→∅),[12.106]→[12.106:136](∅→∅)

local w = App.width(name)+10

[12.121]

[12.122]

local w = Font:getWidth(name)+10
replacement in 0110-maybe_draw_overflow_button at line 5

[12.155]→[12.155:187](∅→∅)

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

[12.155]

[12.187]

local w2 = Font:getWidth('>>')+10
replacement in 0106-stop_button at line 10

[12.250]→[12.68:100](∅→∅),[12.654]→[12.68:100](∅→∅),[12.1362]→[12.68:100](∅→∅),[12.68]→[12.68:100](∅→∅)

local w = App.width('stop')+10

[12.250]

[12.1451]

local w = Font:getWidth('stop')+10
replacement in 0106-stop_button at line 12

[12.1469]→[7.57:60](∅→∅)

end

[12.1469]

end
replacement in 0081-draw_settings_menu at line 11

[12.3353]→[12.3353:3408](∅→∅)

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

[12.3353]

[5.744]

local sx = x+Font:getWidth('bg')+50 -- align all sliders
replacement in 0081-draw_settings_menu at line 63

[5.1312]→[12.5309:5312](∅→∅),[12.5309]→[12.5309:5312](∅→∅)

end

[5.1312]

end
replacement in 0070-code_editor_state at line 6

[12.2710]→[12.2710:2772](∅→∅)

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

[12.2710]

[8.195]

math.min(100+30*Font:getWidth('m'), Safe_width*2/3), -- right
replacement in 0070-code_editor_state at line 10

[12.2865]→[12.2865:2868](∅→∅)

end

[12.2865]

end
replacement in 0051-run_button at line 29

[12.812]→[12.812:843](∅→∅)

local w = App.width('run')+10

[12.812]

[12.4068]

local w = Font:getWidth('run')+10
replacement in 0051-run_button at line 31

[12.4086]→[6.216:219](∅→∅)

end

[12.4086]

end
replacement in 0032-update_font_settings at line 6

[12.978]→[12.222:278](∅→∅),[12.222]→[12.222:278](∅→∅)

Line_number_padding = Line_number_width*App.width('m')

[12.72]

[12.278]

Line_number_padding = Line_number_width*Font:getWidth('m')
replacement in 0032-update_font_settings at line 12

[12.863]→[12.863:939](∅→∅)

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

[12.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

[12.1016]→[9.176:236](∅→∅)

edit.update_font_settings(pane.editor_state, Font_height)

[12.1016]

[12.1076]

edit.update_font_settings(pane.editor_state, Font_height, Font)
replacement in 0032-update_font_settings at line 19

[12.1113]→[9.237:304](∅→∅)

edit.update_font_settings(pane.output_editor_state, Font_height)

[12.1113]

[12.367]

edit.update_font_settings(pane.output_editor_state, Font_height, Font)
replacement in 0032-update_font_settings at line 22

[12.697]→[12.662:665](∅→∅),[12.1118]→[12.662:665](∅→∅),[12.662]→[12.662:665](∅→∅)

end

[12.1118]

end
replacement in 0031-on.resize at line 4

[12.121]→[12.121:197](∅→∅)

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

[12.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

[12.596]→[12.246:249](∅→∅),[12.1264]→[12.246:249](∅→∅),[12.1575]→[12.246:249](∅→∅),[12.246]→[12.246:249](∅→∅)

end

[12.596]

end
replacement in 0021-draw_menu at line 12

[12.5743]→[12.7781:7837](∅→∅),[12.7781]→[12.7781:7837](∅→∅)

x = x+5 + App.width(tostring(Current_pane_index)) + 10

[12.5743]

[12.144]

x = x+5 + Font:getWidth(tostring(Current_pane_index)) + 10
replacement in 0021-draw_menu at line 17

[12.313]→[12.313:378](∅→∅)

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

[12.313]

[12.378]

local w = Font:getWidth('code')+10
local w2 = Font:getWidth('>>')+10
replacement in 0021-draw_menu at line 36

[12.4651]→[12.4651:4718](∅→∅)

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

[12.4651]

[12.4718]

local w = Font:getWidth('screen')+10
local w2 = Font:getWidth('>>')+10
replacement in 0021-draw_menu at line 56

[12.5795]→[10.172:175](∅→∅)

end

[12.5795]

end
replacement in 0011-on.initialize at line 10

[12.1100]→[12.3220:3276](∅→∅),[12.3220]→[12.3220:3276](∅→∅)

Line_number_padding = Line_number_width*App.width('m')

[12.1100]

[12.447]

Line_number_padding = Line_number_width*Font:getWidth('m')