mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 20:57:35 +00:00
Add a simple Font class.
This commit is contained in:
parent
a6e0577f30
commit
110d01941a
6 changed files with 79 additions and 22 deletions
|
@ -1,19 +1,13 @@
|
|||
#include "Painter.h"
|
||||
#include "FrameBufferSDL.h"
|
||||
#include "Widget.h"
|
||||
#include "Font.h"
|
||||
#include <AK/Assertions.h>
|
||||
#include <SDL.h>
|
||||
|
||||
#if 0
|
||||
#include "Peanut8x8.h"
|
||||
#define FONT_NAMESPACE Peanut8x8
|
||||
#else
|
||||
#include "Peanut8x10.h"
|
||||
#define FONT_NAMESPACE Peanut8x10
|
||||
#endif
|
||||
|
||||
Painter::Painter(Widget& widget)
|
||||
: m_widget(widget)
|
||||
, m_font(Font::defaultFont())
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -66,31 +60,31 @@ void Painter::drawText(const Rect& rect, const String& text, TextAlignment align
|
|||
|
||||
if (alignment == TextAlignment::TopLeft) {
|
||||
point = rect.location();
|
||||
point.moveBy(m_widget.x(), m_widget.y());;
|
||||
point.moveBy(m_widget.x(), m_widget.y());
|
||||
} else if (alignment == TextAlignment::Center) {
|
||||
int textWidth = text.length() * FONT_NAMESPACE::fontWidth;
|
||||
int textWidth = text.length() * m_font.glyphWidth();
|
||||
point = rect.center();
|
||||
point.moveBy(-(textWidth / 2), -(FONT_NAMESPACE::fontWidth / 2));
|
||||
point.moveBy(-(textWidth / 2), -(m_font.glyphWidth() / 2));
|
||||
point.moveBy(m_widget.x(), m_widget.y());
|
||||
} else {
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
|
||||
for (int row = 0; row < FONT_NAMESPACE::fontHeight; ++row) {
|
||||
for (int row = 0; row < m_font.glyphHeight(); ++row) {
|
||||
int y = point.y() + row;
|
||||
dword* bits = scanline(y);
|
||||
for (unsigned i = 0; i < text.length(); ++i) {
|
||||
byte ch = text[i];
|
||||
if (ch == ' ')
|
||||
continue;
|
||||
if (ch < FONT_NAMESPACE::firstCharacter || ch > FONT_NAMESPACE::lastCharacter) {
|
||||
const char* glyph = m_font.glyph(ch);
|
||||
if (!ch) {
|
||||
printf("Font doesn't have 0x%02x ('%c')\n", ch, ch);
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
const char* fontCharacter = FONT_NAMESPACE::font[ch - FONT_NAMESPACE::firstCharacter];
|
||||
int x = point.x() + i * FONT_NAMESPACE::fontWidth;
|
||||
for (unsigned j = 0; j < FONT_NAMESPACE::fontWidth; ++j) {
|
||||
char fc = fontCharacter[row * FONT_NAMESPACE::fontWidth + j];
|
||||
int x = point.x() + i * m_font.glyphWidth();
|
||||
for (unsigned j = 0; j < m_font.glyphWidth(); ++j) {
|
||||
char fc = glyph[row * m_font.glyphWidth() + j];
|
||||
if (fc == '#')
|
||||
bits[x + j] = color.value();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue