ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

missing ellipsis char to some fonts added

This commit is contained in:
thrust26 2017-11-21 11:45:28 +01:00
parent 7a65a4445b
commit cc45822816
4 changed files with 121 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/debugger/gui/DebuggerDialog.cxx
View File

@ -416,7 +416,7 @@ void DebuggerDialog::addRomArea()
int xpos = buttonX - 8*myLFont->getMaxCharWidth() - 20, ypos = 30; int xpos = buttonX - 8*myLFont->getMaxCharWidth() - 20, ypos = 30;
bwidth = myLFont->getStringWidth("Options" + ELLIPSIS) + 8; bwidth = myLFont->getStringWidth("Options " + ELLIPSIS);
bheight = myLFont->getLineHeight() + 2; bheight = myLFont->getLineHeight() + 2;
new ButtonWidget(this, *myLFont, xpos, r.top + 5, bwidth, bheight, "Options" + ELLIPSIS, kDDOptionsCmd); new ButtonWidget(this, *myLFont, xpos, r.top + 5, bwidth, bheight, "Options" + ELLIPSIS, kDDOptionsCmd);

40
src/gui/ConsoleBFont.hxx
View File

@ -42,6 +42,42 @@ namespace GUI {
// Font character bitmap data. // Font character bitmap data.
static const uInt16 consoleB_font_bits[] = { static const uInt16 consoleB_font_bits[] = {
/* MODIFIED
Character 29 (0x1d):
width 8
bbx ( 8, 13, 0, -2 )
+--------+
| |
| |
| |
| |
| |
| |
| |
| |
| |
|XX XX XX|
|XX XX XX|
| |
| |
+--------+
*/
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0b1101101100000000,
0b1101101100000000,
0x0000,
0x0000,
/* MODIFIED /* MODIFIED
Character 30 (0x1e): large centered rounded rectangle Character 30 (0x1e): large centered rounded rectangle
width 8 width 8
@ -3350,8 +3386,8 @@ static const FontDesc consoleBDesc = {
13, 13,
8, 13, 0, -2, 8, 13, 0, -2,
11, 11,
30, 29,
97, 98,
consoleB_font_bits, consoleB_font_bits,
nullptr, /* no encode table*/ nullptr, /* no encode table*/
nullptr, /* fixed width*/ nullptr, /* fixed width*/

43
src/gui/ConsoleMediumBFont.hxx
View File

@ -42,6 +42,45 @@ namespace GUI {
// Font character bitmap data. // Font character bitmap data.
static const uInt16 consoleMediumB_font_bits[] = { static const uInt16 consoleMediumB_font_bits[] = {
/* MODIFIED
Character 29 (0x1d): ellipsis
width 9
bbx ( 9, 15, 0, -3 )
+---------+
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| XX XX XX|
| XX XX XX|
| |
| |
| |
+---------+
*/
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0b0110110110000000,
0b0110110110000000,
0x0000,
0x0000,
0x0000,
/* MODIFIED /* MODIFIED
Character 30 (0x1e): large centered rounded rectangle Character 30 (0x1e): large centered rounded rectangle
width 9 width 9
@ -3738,8 +3777,8 @@ static const FontDesc consoleMediumBDesc = {
15, 15,
9, 15, 0, -3, 9, 15, 0, -3,
12, 12,
30, 29,
97, 98,
consoleMediumB_font_bits, consoleMediumB_font_bits,
nullptr, /* no encode table*/ nullptr, /* no encode table*/
nullptr, /* fixed width*/ nullptr, /* fixed width*/

43
src/gui/ConsoleMediumFont.hxx
View File

@ -42,6 +42,45 @@ namespace GUI {
// Font character bitmap data. // Font character bitmap data.
static const uInt16 consoleMedium_font_bits[] = { static const uInt16 consoleMedium_font_bits[] = {
/* MODIFIED
Character 29 (0x1d): ellipsis
width 9
bbx ( 9, 15, 0, -3 )
+---------+
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| XX XX XX|
| XX XX XX|
| |
| |
| |
+---------+
*/
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0x0000,
0b0110110110000000,
0b0110110110000000,
0x0000,
0x0000,
0x0000,
/* MODIFIED /* MODIFIED
Character 30 (0x1e): large centered rounded rectangle Character 30 (0x1e): large centered rounded rectangle
width 9 width 9
@ -3738,8 +3777,8 @@ static const FontDesc consoleMediumDesc = {
15, 15,
9, 15, 0, -3, 9, 15, 0, -3,
12, 12,
30, 29,
97, 98,
consoleMedium_font_bits, consoleMedium_font_bits,
nullptr, /* no encode table*/ nullptr, /* no encode table*/
nullptr, /* fixed width*/ nullptr, /* fixed width*/