curioustorvald/tsvm
1
0
Fork 0
mirror of https://github.com/curioustorvald/tsvm.git synced 2026-06-10 06:54:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

edit.js: vert scrolling when cursoringCol > screenWidth will no longer scroll a shorter-than-screenwidth-line that results hiding the contents

Browse Source
This commit is contained in:
minjaesong
2021-04-22 13:16:18 +09:00
parent 209266d510
commit 0a76ad89c1
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
assets/disk0/tvdos/bin/edit.js
View File

@@ -71,7 +71,7 @@ function drawLineNumbers() {
for (let y = 0; y < paintHeight; y++) { for (let y = 0; y < paintHeight; y++) {
con.move(y + PAINT_START_Y, 1); con.move(y + PAINT_START_Y, 1);
let lnum = scroll + y + 1; let lnum = scroll + y + 1;
if (lnum - 1 >= textbuffer.length) print(' '); if (lnum < 1 || lnum - 1 >= textbuffer.length) print(' ');
else if (lnum >= 1000) print(`${lnum}`); else if (lnum >= 1000) print(`${lnum}`);
else if (lnum >= 100) print(`${lnum} `); else if (lnum >= 100) print(`${lnum} `);
else if (lnum >= 10) print(` ${lnum} `); else if (lnum >= 10) print(` ${lnum} `);
@@ -311,10 +311,11 @@ function cursorMoveRelative(odx, ody) {
dy = -cursorRow; dy = -cursorRow;
let nextRow = cursorRow + dy; let nextRow = cursorRow + dy;
let nextRowLen = textbuffer[nextRow].length;
// clamp dx // clamp dx
if (cursorCol + dx > textbuffer[nextRow].length) if (cursorCol + dx > nextRowLen)
dx = (textbuffer[nextRow].length) - cursorCol; dx = (nextRowLen) - cursorCol;
else if (cursorCol + dx < 0) else if (cursorCol + dx < 0)
dx = -cursorCol; dx = -cursorCol;
@@ -322,7 +323,7 @@ function cursorMoveRelative(odx, ody) {
// set dx to the value that makes cursor to follow the minof(textlen, cursoringCol) // set dx to the value that makes cursor to follow the minof(textlen, cursoringCol)
if (cursoringCol != nextCol) { if (cursoringCol != nextCol) {
dx = Math.min(cursoringCol, textbuffer[nextRow].length) - cursorCol; dx = Math.min(cursoringCol, nextRowLen) - cursorCol;
} }
nextCol = cursorCol + dx; nextCol = cursorCol + dx;
@@ -341,15 +342,15 @@ function cursorMoveRelative(odx, ody) {
// NOTE: this scroll clamping is moved outside of go-left/go-right if-statements above because // NOTE: this scroll clamping is moved outside of go-left/go-right if-statements above because
// vertical movements can disrupt horizontal scrolls as well due to the cursoringCol variable // vertical movements can disrupt horizontal scrolls as well due to the cursoringCol variable
// scroll to the left?
if (scrollHor <= -1)
scrollHor = 0;
// scroll to the right? // scroll to the right?
else if (scrollHor > textbuffer[nextRow].length - paintWidth + scrollHorPeek) if (nextRowLen > paintWidth && scrollHor > nextRowLen - paintWidth + scrollHorPeek)
// to prevent overscrolling that might happen after some complex navigation, AND // to prevent overscrolling that might happen after some complex navigation, AND
// to make sure text cursor to be placed at the right end of the screen where "more line arrow" // to make sure text cursor to be placed at the right end of the screen where "more line arrow"
// goes which also makes editing field 1 character wider // goes which also makes editing field 1 character wider
scrollHor = textbuffer[nextRow].length - paintWidth + scrollHorPeek; scrollHor = nextRowLen - paintWidth + scrollHorPeek;
// scroll to the left? (order is important!)
if (scrollHor <= -1 || nextRowLen < paintWidth - scrollHorPeek)
scrollHor = 0;
} }
// update vertical scroll stats // update vertical scroll stats
@@ -368,11 +369,11 @@ function cursorMoveRelative(odx, ody) {
// "normally" when you go right at the end of the line, you appear at the start of the next line // "normally" when you go right at the end of the line, you appear at the start of the next line
// scroll to the bottom? // scroll to the bottom?
if (scroll > textbuffer.length - paintHeight) if (textbuffer.length > paintHeight && scroll > textbuffer.length - paintHeight)
// to make sure not show buncha empty lines // to make sure not show buncha empty lines
scroll = textbuffer.length - paintHeight; scroll = textbuffer.length - paintHeight;
// scroll to the top? // scroll to the top? (order is important!)
else if (scroll <= -1) if (scroll <= -1)
scroll = 0; // scroll of -1 would result to show "Line 0" on screen scroll = 0; // scroll of -1 would result to show "Line 0" on screen
} }