diff --git a/src/debugger/gui/DebuggerDialog.cxx b/src/debugger/gui/DebuggerDialog.cxx index fa133d782..2c4417a1b 100644 --- a/src/debugger/gui/DebuggerDialog.cxx +++ b/src/debugger/gui/DebuggerDialog.cxx @@ -416,7 +416,7 @@ void DebuggerDialog::addRomArea() int xpos = buttonX - 8*myLFont->getMaxCharWidth() - 20, ypos = 30; - bwidth = myLFont->getStringWidth("Options" + ELLIPSIS) + 8; + bwidth = myLFont->getStringWidth("Options " + ELLIPSIS); bheight = myLFont->getLineHeight() + 2; new ButtonWidget(this, *myLFont, xpos, r.top + 5, bwidth, bheight, "Options" + ELLIPSIS, kDDOptionsCmd); diff --git a/src/gui/ConsoleBFont.hxx b/src/gui/ConsoleBFont.hxx index 75d019cf8..752341cef 100644 --- a/src/gui/ConsoleBFont.hxx +++ b/src/gui/ConsoleBFont.hxx @@ -42,6 +42,42 @@ namespace GUI { // Font character bitmap data. 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 Character 30 (0x1e): large centered rounded rectangle width 8 @@ -3350,8 +3386,8 @@ static const FontDesc consoleBDesc = { 13, 8, 13, 0, -2, 11, - 30, - 97, + 29, + 98, consoleB_font_bits, nullptr, /* no encode table*/ nullptr, /* fixed width*/ diff --git a/src/gui/ConsoleMediumBFont.hxx b/src/gui/ConsoleMediumBFont.hxx index 168281f14..702a97a2d 100644 --- a/src/gui/ConsoleMediumBFont.hxx +++ b/src/gui/ConsoleMediumBFont.hxx @@ -42,6 +42,45 @@ namespace GUI { // Font character bitmap data. 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 Character 30 (0x1e): large centered rounded rectangle width 9 @@ -3738,8 +3777,8 @@ static const FontDesc consoleMediumBDesc = { 15, 9, 15, 0, -3, 12, - 30, - 97, + 29, + 98, consoleMediumB_font_bits, nullptr, /* no encode table*/ nullptr, /* fixed width*/ diff --git a/src/gui/ConsoleMediumFont.hxx b/src/gui/ConsoleMediumFont.hxx index ed68bd158..9519ae02a 100644 --- a/src/gui/ConsoleMediumFont.hxx +++ b/src/gui/ConsoleMediumFont.hxx @@ -42,6 +42,45 @@ namespace GUI { // Font character bitmap data. 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 Character 30 (0x1e): large centered rounded rectangle width 9 @@ -3738,8 +3777,8 @@ static const FontDesc consoleMediumDesc = { 15, 9, 15, 0, -3, 12, - 30, - 97, + 29, + 98, consoleMedium_font_bits, nullptr, /* no encode table*/ nullptr, /* fixed width*/