pijul nest
guest › [sign in] [explore]

resolve conflicts

akkartik
Dec 29, 2023, 10:44 PM
VSGPLJFA25LH5JYS5SQBQCKD7T763WSK7UYN4XMOFHUMQWAWSI7QC

Dependencies

Change contents

  • file deletion: source_edit.lua (----------)source_edit.lua (----------)
    [4.2]→[4.165788:165827](∅→∅),[4.2]→[4.165788:165827](∅→∅),[4.165827]→[4.152503:152503](∅→∅)
    function edit.initialize_state(top, left, right, font, font_height, line_height) -- currently always draws to bottom of screen
    font = font,
    end -- edit.initialize_state
    love.graphics.setFont(State.font)
    State.font = love.graphics.newFont(State.font_height)
    love.graphics.getFont(),
    14,
    15) -- line height
    end
    State.line_height = math.floor(font_height*1.3)
    App.color(Text_color)
    font_height = font_height,
    line_height = line_height,
    local result = {
  • file deletion: source.lua (----------)source.lua (----------)
    [4.2]→[4.177715:177749](∅→∅),[4.2]→[4.177715:177749](∅→∅),[4.177749]→[4.165829:165829](∅→∅)
    local font = love.graphics.newFont(settings.font_height)
    Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), right, font, settings.font_height, math.floor(settings.font_height*1.3))
    local font = love.graphics.newFont(font_height)
    Editor_state = edit.initialize_state(Margin_top, Margin_left + Line_number_width*App.width('m'), App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
    Editor_state.filename = 'run.lua'
    source.initialize_window_geometry()
    Editor_state.filename = settings.filename
    -- set up desired window dimensions and make window resizable
    _, _, App.screen.flags = App.screen.size()
    App.screen.flags.resizable = true
    App.screen.width, App.screen.height = settings.width, settings.height
    App.screen.resize(App.screen.width, App.screen.height, App.screen.flags)
  • file deletion: run.lua (----------)run.lua (----------)
    [4.2]→[4.183867:183898](∅→∅),[4.2]→[4.183867:183898](∅→∅),[4.183898]→[4.178107:178107](∅→∅)
    local font = love.graphics.newFont(Settings.font_height)
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, Settings.font_height, math.floor(Settings.font_height*1.3))
    local font = love.graphics.newFont(font_height)
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))
    Settings = run.settings()
    end
    run.initialize_window_geometry()
    Editor_state.filename = Settings.filename
    Editor_state.screen_top1 = Settings.screen_top
    Editor_state.cursor1 = Settings.cursor
    end
    -- set up desired window dimensions and make window resizable
    _, _, App.screen.flags = App.screen.size()
  • file deletion: log_browser.lua (----------)log_browser.lua (----------)
    [4.2]→[4.202684:202723](∅→∅),[4.2]→[4.202684:202723](∅→∅),[4.202723]→[4.191243:191243](∅→∅)
    Log_browser_state = edit.initialize_state(Margin_top, Editor_state.right + Margin_right + Margin_left, (Editor_state.right+Margin_right)*2, Editor_state.font, Editor_state.font_height, Editor_state.line_height)
    Log_browser_state.filename = 'log'
    load_from_disk(Log_browser_state) -- TODO: pay no attention to Fold
    log_browser.parse(Log_browser_state)
    Text.redraw_all(Log_browser_state)
    Log_browser_state.screen_top1 = {line=1, pos=1}
  • replacement in main.lua at line 99
    [4.3172]→[4.3172:3241](∅→∅)
    love.graphics.setFont(love.graphics.newFont(settings.font_height))
    [4.3172]
    [4.10]
    local font = love.graphics.newFont(settings.font_height)
  • replacement in main.lua at line 106
    [4.166]→[4.3805:3960](∅→∅),[4.225]→[4.3805:3960](∅→∅),[4.2630]→[4.3805:3960](∅→∅),[4.3805]→[4.3805:3960](∅→∅)
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, settings.font_height, math.floor(settings.font_height*1.3))
    [4.166]
    [4.3960]
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, settings.font_height, math.floor(settings.font_height*1.3))
  • replacement in main.lua at line 124
    [4.4163]→[4.4163:4223](∅→∅)
    love.graphics.setFont(love.graphics.newFont(font_height))
    [4.4163]
    [4.10]
    local font = love.graphics.newFont(font_height)
  • replacement in main.lua at line 126
    [4.41]→[4.4322:4515](∅→∅),[4.53]→[4.4322:4515](∅→∅),[4.4322]→[4.4322:4515](∅→∅)
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right)
    Editor_state.font_height = font_height
    Editor_state.line_height = math.floor(font_height*1.3)
    [4.41]
    [4.4538]
    Editor_state = edit.initialize_state(Margin_top, Margin_left, App.screen.width-Margin_right, font, font_height, math.floor(font_height*1.3))