akkartik/pensieve.love - Change YKRUNSPXQMYUZM2HC2BWRL3OLVF5X3Y3XASG7JCT4TW4VUHZD6ZAC

new design for command palette

As recommended by Nextjournal (https://www.youtube.com/watch?v=A0TafHXszgM) and Jack Rusher (http://akkartik.name/archives/foc/share-your-work/1658973003.417109.html#1658994188.140719).

The poor aesthetics are all me. Also, I'm putting the menu/palette up top due to a technical difficulty: the basic contract of the editor widget from lines.love is to draw from a given (top,left,right) to the bottom of the screen. There's currently no way to specify a bottom.

Created by Kartik K. Agaram on August 4, 2022

YKRUNSPXQMYUZM2HC2BWRL3OLVF5X3Y3XASG7JCT4TW4VUHZD6ZAC

Dependencies

In channels

main

Change contents

Replacement in main.lua at line 66 [5.2]
B:BD[4.9] → [2.8:44]
```
  -- space saved for column headers
```
[4.9]
[2.44]
```
  -- space saved for headers
```

Replacement in main.lua at line 68 [5.2]

∅:D[2.108] → [4.9:47]

B:BD[4.9] → [4.9:47]

  Header_height = 5 + Line_height + 5

[2.108]

[6.283]

  Menu_status_bar_height = 5 + Line_height + 5
  Column_header_height = 5 + Line_height + 5
  Header_height = Menu_status_bar_height + Column_header_height
  Menu_text_cache = {}  -- a few text objects we can avoid recomputing unless the font changes

Insertion in main.lua at line 335 [5.2]
[7.5096]
[8.28]
```
  draw_menu_bar()
```

Insertion in main.lua at line 343 [5.2]

[9.332]

--?     draw_maximized_mode_menu_bar(pane.left, pane.right)

Replacement in main.lua at line 391 [5.2]

B:BD[10.110] → [11.551:702]

    love.graphics.rectangle('fill', sx-Display_settings.x - Margin_left, 0, Margin_left + Display_settings.column_width + Margin_right, Header_height)

[10.110]

[10.260]

    love.graphics.rectangle('fill', sx-Display_settings.x - Margin_left, Menu_status_bar_height, Margin_left + Display_settings.column_width + Margin_right, Column_header_height)

Replacement in main.lua at line 393 [5.2]

B:BD[10.286] → [11.703:766]

    love.graphics.print(column.name, sx-Display_settings.x, 5)

[10.286]

[11.766]

    love.graphics.print(column.name, sx-Display_settings.x, Menu_status_bar_height+5)

Insertion in main.lua at line 962 [5.2]
[3.41]
[3.41]
```
  Menu_text_cache = {}
```

Insertion in commands.lua at line 74 [14.39]

[12.227]

[13.57]


-- We incrementally create the menu based on context. Menu_cursor tracks how
-- far along the screen width we've gotten.
Menu_cursor = 0
Palette_cursor = {y=0, x=0}
function draw_menu_bar()
  if App.run_tests then return end  -- disable in tests
  App.color(Command_palette_background_color)
  love.graphics.rectangle('fill', 0,0, App.screen.width, Menu_status_bar_height)
  App.color(Command_palette_border_color)
  love.graphics.rectangle('line', 0,0, App.screen.width, Menu_status_bar_height)
  if Display_settings.show_palette then
    return
  end
  App.color(Command_palette_command_color)
  love.graphics.print('ctrl+enter: search commands...', 5,5)
  App.color(Command_palette_border_color)
  Menu_cursor = 360
  love.graphics.line(Menu_cursor-10,2, Menu_cursor-10,Menu_status_bar_height-2)
  if Display_settings.mode == 'normal' then
    local pane = Surface[Cursor_pane.col][Cursor_pane.row]
    if not pane.editable then
      local left_sx = left_edge_sx(Cursor_pane.col)
      local up_sy = up_edge_sy(Cursor_pane.col, Cursor_pane.row)
      if overlap(left_sx, left_sx+Display_settings.column_width, Display_settings.x, Display_settings.x+App.screen.width)
          and overlap(up_sy, up_sy+pane.height, Display_settings.y, Display_settings.y+App.screen.height-Header_height) then
        add_hotkey_to_menu('ctrl+e: edit')
        add_panning_hotkeys_to_menu()
      end
      add_hotkey_to_menu('x/X: narrower/wider columns')
    else
      if pane.cursor_x >= 0 and pane.cursor_x < App.screen.width and pane.cursor_y >= Header_height and pane.cursor_y < App.screen.height then
        add_hotkey_to_menu('ctrl+e: stop editing')
      else
        add_panning_hotkeys_to_menu()
      end
    end
  end
  add_hotkey_to_menu('ctrl+= ctrl+- ctrl+0: zoom')
end
function add_panning_hotkeys_to_menu()
  add_hotkey_to_menu('arrows shift+arrows ctrl+up/down: pan')
end
function add_hotkey_to_menu(s)
  if Menu_text_cache[s] == nil then
    Menu_text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Menu_text_cache[s])
  if Menu_cursor + width > App.screen.width - 5 then
    return
  end
  App.color(Command_palette_command_color)
  App.screen.draw(Menu_text_cache[s], Menu_cursor,5)
  Menu_cursor = Menu_cursor + width + 30
end
-- unused
function draw_maximized_mode_menu_bar(left, right)
  App.color(Command_palette_background_color)
  love.graphics.rectangle('fill', left-Margin_left,0, Margin_left+right-left+Margin_right, Menu_status_bar_height)
  App.color(Command_palette_border_color)
  love.graphics.rectangle('line', left-Margin_left,0, Margin_left+right-left+Margin_right, Menu_status_bar_height)
end

Deletion in commands.lua at line 183 [14.39]

B:BD[14.746] → [14.746:998]

  local pwidth,pheight = 400, 300
  local left = math.max(App.screen.width/2-pwidth/2, 0)
  local top = math.max(App.screen.height/2-pheight/2, 0)
  local width = math.min(pwidth, App.screen.width)
  local height = math.min(pheight, App.screen.height)

Replacement in commands.lua at line 185 [14.39]

B:BD[14.1060] → [14.1060:1148]

  love.graphics.rectangle('fill', left, top, width, height, 10, 10)  -- rounded corners

[14.1060]

[14.1148]

  love.graphics.rectangle('fill', 0,0, App.screen.width, Menu_status_bar_height)

Replacement in commands.lua at line 187 [14.39]

B:BD[14.1190] → [14.1190:1359]

  love.graphics.rectangle('line', left, top, width, height, 10, 10)  -- rounded corners
  love.graphics.line(left, top+5+Line_height+5, left+width, top+5+Line_height+5)

[14.1190]

[14.1359]

  love.graphics.rectangle('line', 0,0, App.screen.width, Menu_status_bar_height)

Replacement in commands.lua at line 190 [14.39]
B:BD[14.1417] → [14.1417:1454]
```
  draw_palette_input(left+10, top+5)
```
[14.1417]
[14.1454]
```
  draw_palette_input(5, 5)
```

Insertion in commands.lua at line 192 [14.39]

[14.1472]

  App.color(Command_palette_background_color)
  love.graphics.rectangle('fill', 0, Menu_status_bar_height, App.screen.width, 5+5*Line_height+5)
  App.color(Command_palette_border_color)
  love.graphics.rectangle('line', 0, Menu_status_bar_height, App.screen.width, 5+5*Line_height+5)

Replacement in commands.lua at line 197 [14.39]

B:BD[14.1520] → [14.1520:1702]

  local y = top+5+Line_height+5+5
  for _,cmd in ipairs(candidates()) do
    love.graphics.print(cmd, left+5,y)
    y = y+Line_height
    if y >= top+height then
      break
    end

[14.1520]

[14.1702]

  Palette_cursor = {y=Menu_status_bar_height+5, x=5, nextx=5}
  for i,cmd in ipairs(candidates()) do
    add_command_to_palette(cmd)
  end
end
function add_command_to_palette(s)
  if Menu_text_cache[s] == nil then
    Menu_text_cache[s] = App.newText(love.graphics.getFont(), s)
  end
  local width = App.width(Menu_text_cache[s])
  if Palette_cursor.x + width/2 > App.screen.width - 5 then
    return
  end
  App.screen.draw(Menu_text_cache[s], Palette_cursor.x, Palette_cursor.y)
  Palette_cursor.nextx = math.max(Palette_cursor.nextx, Palette_cursor.x+width+10)
  Palette_cursor.y = Palette_cursor.y + Line_height
  if Palette_cursor.y >= Menu_status_bar_height + 5+5*Line_height then
    love.graphics.line(Palette_cursor.nextx, Menu_status_bar_height+2, Palette_cursor.nextx, Menu_status_bar_height + 5+5*Line_height+5)
    Palette_cursor.x = Palette_cursor.nextx + 5
    Palette_cursor.y = Menu_status_bar_height+5