From a99e13623a367ffcd0a4f125d16f90b928237f34 Mon Sep 17 00:00:00 2001 From: Ingo Ruhnke Date: Mon, 29 Jan 2007 11:10:40 +0000 Subject: [PATCH] - added new console font SVN-Revision: 4725 --- data/images/engine/fonts/console2-shadow.png | Bin 0 -> 3028 bytes data/images/engine/fonts/console2.png | Bin 0 -> 3126 bytes src/console.cpp | 10 +++++----- src/video/font.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 data/images/engine/fonts/console2-shadow.png create mode 100644 data/images/engine/fonts/console2.png diff --git a/data/images/engine/fonts/console2-shadow.png b/data/images/engine/fonts/console2-shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..5ccc89fdacad30bdfb4eb7a43b13c7d4e62f863c GIT binary patch literal 3028 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 background.reset(new Surface("images/engine/console.png")); background2.reset(new Surface("images/engine/console2.png")); @@ -457,7 +457,7 @@ Console::draw(DrawingContext& context) if (focused) { lineNo++; - float py = height-4-1*9; + float py = height-4-1 * font->get_height(); context.draw_text(font.get(), "> "+inputBuffer.str()+"_", Vector(4, py), ALIGN_LEFT, layer); } @@ -465,8 +465,8 @@ Console::draw(DrawingContext& context) for (std::list::iterator i = lines.begin(); i != lines.end(); i++) { if (skipLines-- > 0) continue; lineNo++; - float py = height-4-lineNo*9; - if (py < -9) break; + float py = height - 4 - lineNo*font->get_height(); + if (py < -font->get_height()) break; context.draw_text(font.get(), *i, Vector(4, py), ALIGN_LEFT, layer); } context.pop_transform(); diff --git a/src/video/font.cpp b/src/video/font.cpp index 92eb42a23..db0633eed 100644 --- a/src/video/font.cpp +++ b/src/video/font.cpp @@ -156,7 +156,7 @@ Font::Font(GlyphWidth glyph_width_, else // glyph is completly transparent glyph.rect = Rect(x, y, x + char_width, y + char_height); - glyph.advance = glyph.rect.get_width(); + glyph.advance = glyph.rect.get_width() + 1; // FIXME: might be usefull to make spacing configurable glyphs.push_back(glyph); shadow_glyphs.push_back(glyph); -- 2.11.0