adafruit-mirror/Fruit-Jam-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #50 from RetiredWizard/fruitjameditor
Some checks failed
Validate Build / validate-build (push) Has been cancelled
Details

Browse source 
Editor scrolling fix, PyDOS updates
This commit is contained in:
foamyguy 2025-08-13 13:22:35 -05:00 committed by GitHub
commit c47c06865d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1400 additions and 1385 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1387
builtin_apps/PyDOS/PyDOS.py Normal file
View file

File diff suppressed because it is too large Load diff

1386
builtin_apps/PyDOS/code.py
View file

File diff suppressed because it is too large Load diff

10
builtin_apps/editor/adafruit_editor/editor.py
View file

@ -259,6 +259,7 @@ def editor(stdscr, filename, mouse=None, terminal_tilegrid=None): # pylint: dis
cursor = Cursor() cursor = Cursor()
terminal_tilegrid.pixel_shader[cursor.col,cursor.row] = [1, 0] terminal_tilegrid.pixel_shader[cursor.col,cursor.row] = [1, 0]
old_cursor_pos = (cursor.col, cursor.row) old_cursor_pos = (cursor.col, cursor.row)
old_window_pos = (window.col, window.row)
# try: # try:
# visible_cursor.text = buffer[0][0] # visible_cursor.text = buffer[0][0]
# except IndexError: # except IndexError:
@ -446,10 +447,12 @@ def editor(stdscr, filename, mouse=None, terminal_tilegrid=None): # pylint: dis
# print("updating visible cursor") # print("updating visible cursor")
# print(f"anchored pos: {((cursor.col * 6) - 1, (cursor.row * 12) + 20)}") # print(f"anchored pos: {((cursor.col * 6) - 1, (cursor.row * 12) + 20)}")
if old_cursor_pos != (cursor.col, cursor.row): if (old_cursor_pos[0] - old_window_pos[0] != cursor.col - window.col or
old_cursor_pos[1] - old_window_pos[1] != cursor.row - window.row):
#print(f"old cursor: {old_cursor_pos}, new: {(cursor.col, cursor.row)}") #print(f"old cursor: {old_cursor_pos}, new: {(cursor.col, cursor.row)}")
terminal_tilegrid.pixel_shader[old_cursor_pos[0], old_cursor_pos[1]] = [0,1] #print(f"window: {window.row}, {window.col}")
terminal_tilegrid.pixel_shader[cursor.col, cursor.row] = [1,0] terminal_tilegrid.pixel_shader[old_cursor_pos[0] - old_window_pos[0], old_cursor_pos[1] - old_window_pos[1]] = [0,1]
terminal_tilegrid.pixel_shader[cursor.col - window.col, cursor.row - window.row] = [1,0]
# print(f"old: {terminal_tilegrid.pixel_shader[old_cursor_pos[0], old_cursor_pos[1]]} new: {terminal_tilegrid.pixel_shader[cursor.col, cursor.row]}") # print(f"old: {terminal_tilegrid.pixel_shader[old_cursor_pos[0], old_cursor_pos[1]]} new: {terminal_tilegrid.pixel_shader[cursor.col, cursor.row]}")
# visible_cursor.anchored_position = ((cursor.col * 6) - 1, (cursor.row * 12) + 20) # visible_cursor.anchored_position = ((cursor.col * 6) - 1, (cursor.row * 12) + 20)
@ -463,6 +466,7 @@ def editor(stdscr, filename, mouse=None, terminal_tilegrid=None): # pylint: dis
old_cursor_pos = (cursor.col, cursor.row) old_cursor_pos = (cursor.col, cursor.row)
old_window_pos = (window.col, window.row)
def edit(filename, terminal=None, mouse=None, terminal_tilegrid=None): def edit(filename, terminal=None, mouse=None, terminal_tilegrid=None):
with MaybeDisableReload(): with MaybeDisableReload():