Skip to content

Fix default bitmap font measurements #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aardvarkk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix default bitmap font measurements #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions rips/test/DEFAULT_FONT.RIP
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
!|1K|1B3M0C020QPE02080F0F080700000F0700003M
!|1U1C3M00000000<>Default size<>d
!|Y00000100|1U5K3M00000000<>Explicit size 1<>e|#|#|#
Binary file added rips/test/DEFAULT_FONT.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ripterm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ <h6>2011 (v0.1), 2018 (v0.2), 2021 (v0.3), 2026 (v0.4)</h6>
<option value="rips/test/v_VIEW">Test Viewport (v)</option>
<option value="rips/test/Y_FONT">Test Fonts (Y)</option>
<option value="rips/test/BUTTONS">Test Buttons (1B)(1U)</option>
<option value="rips/test/DEFAULT_FONT">Test Default Button Font Size</option>
<option value="rips/test/ICONS">Test Icons (1I)</option>
<option value="rips/test/TXT_VARS">Test Text Variables + Audio</option>
<option value="rips/test/TXT_WIN">Test Text Window</option>
Expand Down
4 changes: 2 additions & 2 deletions src/BGI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ class BGI {
writeMode: 0, // 0=COPY, 1=XOR, 2=OR, 3=AND, 4=NOT
font: { width: 0, height: 0 }, // ??
fontMag: { x: 1.0, y: 1.0 }, // font magnification
text: { font: 0, direction: 0, charsize: 0, horiz: 0, vert: 0 },
text: { font: 0, direction: 0, charsize: 1, horiz: 0, vert: 0 },
};
}

Expand Down Expand Up @@ -2010,7 +2010,7 @@ class BGI {
return 0; // ???
}

// returns object: { font: 0, direction: 0, charsize: 0, horiz: 0, vert: 0 }
// returns object: { font: 0, direction: 0, charsize: 1, horiz: 0, vert: 0 }
gettextsettings () {
// OLD struct textsettingstype *texttypeinfo
return JSON.parse(JSON.stringify(this.info.text)); // copy obj
Expand Down