qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 18:53:09 +02:00
Code

Use the font's suggested line height instead of its ascent and descent.

Browse Source 
In well-described fonts, this enables multi-line text (e.g. in manuals) to be
more readable.

The term "height" is also replaced with "line spacing" in Font's code.
This commit is contained in:
Nebuleon Fumika 2014-06-18 20:07:09 +00:00 committed by Maarten ter Huurne
parent 349e758b3b
commit 099bd24556
14 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/browsedialog.cpp
View File

@ -59,7 +59,7 @@ bool BrowseDialog::exec()
fl->browse(); fl->browse();
const int topBarHeight = gmenu2x->skinConfInt["topBarHeight"]; const int topBarHeight = gmenu2x->skinConfInt["topBarHeight"];
rowHeight = gmenu2x->font->getHeight() + 1; // gp2x=15+1 / pandora=19+1 rowHeight = gmenu2x->font->getLineSpacing() + 1; // gp2x=15+1 / pandora=19+1
rowHeight = constrain(rowHeight, 20, 40); rowHeight = constrain(rowHeight, 20, 40);
numRows = (gmenu2x->resY - topBarHeight - 20) / rowHeight; numRows = (gmenu2x->resY - topBarHeight - 20) / rowHeight;
clipRect = (SDL_Rect) { clipRect = (SDL_Rect) {

6
src/contextmenu.cpp
View File

@ -81,7 +81,7 @@ ContextMenu::ContextMenu(GMenu2X &gmenu2x, Menu &menu)
w = std::max(w, font->getTextWidth(option->text)); w = std::max(w, font->getTextWidth(option->text));
} }
w += 23; w += 23;
const int h = (font->getHeight() + 2) * options.size() + 8; const int h = (font->getLineSpacing() + 2) * options.size() + 8;
box = { box = {
static_cast<Sint16>((gmenu2x.resX - w) / 2), static_cast<Sint16>((gmenu2x.resX - w) / 2),
static_cast<Sint16>((gmenu2x.resY - h) / 2), static_cast<Sint16>((gmenu2x.resY - h) / 2),
@ -116,7 +116,7 @@ void ContextMenu::paint(Surface &s)
gmenu2x.skinConfColors[COLOR_MESSAGE_BOX_BORDER]); gmenu2x.skinConfColors[COLOR_MESSAGE_BOX_BORDER]);
// Draw selection background. // Draw selection background.
const int h = font->getHeight(); const int h = font->getLineSpacing();
SDL_Rect selbox = { SDL_Rect selbox = {
static_cast<Sint16>(box.x + 4), static_cast<Sint16>(box.x + 4),
static_cast<Sint16>(box.y + 4 + (h + 2) * selected), static_cast<Sint16>(box.y + 4 + (h + 2) * selected),
@ -158,7 +158,7 @@ bool ContextMenu::handleButtonPress(InputManager::Button button) {
bool ContextMenu::handleTouchscreen(Touchscreen &ts) { bool ContextMenu::handleTouchscreen(Touchscreen &ts) {
if (ts.inRect(box)) { if (ts.inRect(box)) {
int i = std::max(0, std::min(static_cast<int>(options.size()) - 1, int i = std::max(0, std::min(static_cast<int>(options.size()) - 1,
(ts.getY() - (box.y + 4)) / (gmenu2x.font->getHeight() + 2))); (ts.getY() - (box.y + 4)) / (gmenu2x.font->getLineSpacing() + 2)));
if (ts.released()) { if (ts.released()) {
options[i]->action(); options[i]->action();
dismiss(); dismiss();

10
src/font.cpp
View File

@ -22,7 +22,7 @@ Font *Font::defaultFont()
Font::Font(const std::string &path, unsigned int size) Font::Font(const std::string &path, unsigned int size)
{ {
font = nullptr; font = nullptr;
fontheight = 1; lineSpacing = 1;
/* Note: TTF_Init and TTF_Quit perform reference counting, so call them /* Note: TTF_Init and TTF_Quit perform reference counting, so call them
* both unconditionally for each font. */ * both unconditionally for each font. */
@ -38,7 +38,7 @@ Font::Font(const std::string &path, unsigned int size)
return; return;
} }
fontheight = TTF_FontHeight(font); lineSpacing = TTF_FontLineSkip(font);
} }
Font::~Font() Font::~Font()
@ -76,7 +76,7 @@ void Font::write(Surface *surface, const string &text,
for (vector<string>::const_iterator it = v.begin(); it != v.end(); it++) { for (vector<string>::const_iterator it = v.begin(); it != v.end(); it++) {
writeLine(surface, it->c_str(), x, y, halign, valign); writeLine(surface, it->c_str(), x, y, halign, valign);
y += fontheight; y += lineSpacing;
} }
} }
@ -102,10 +102,10 @@ void Font::writeLine(Surface *surface, const char *text,
case VAlignTop: case VAlignTop:
break; break;
case VAlignMiddle: case VAlignMiddle:
y -= fontheight / 2; y -= lineSpacing / 2;
break; break;
case VAlignBottom: case VAlignBottom:
y -= fontheight; y -= lineSpacing;
break; break;
} }

6
src/font.h
View File

@ -29,9 +29,9 @@ public:
return getTextWidth(text.c_str()); return getTextWidth(text.c_str());
} }
int getHeight() int getLineSpacing()
{ {
return fontheight; return lineSpacing;
} }
void write(Surface *surface, void write(Surface *surface,
@ -45,7 +45,7 @@ private:
int x, int y, HAlign halign, VAlign valign); int x, int y, HAlign halign, VAlign valign);
TTF_Font *font; TTF_Font *font;
unsigned int fontheight; int lineSpacing;
}; };
#endif /* FONT_H */ #endif /* FONT_H */

2
src/iconbutton.cpp
View File

@ -47,7 +47,7 @@ void IconButton::recalcRects() {
static_cast<Sint16>(iconRect.x + iconRect.w + margin), static_cast<Sint16>(iconRect.x + iconRect.w + margin),
static_cast<Sint16>(rect.y + h / 2), static_cast<Sint16>(rect.y + h / 2),
static_cast<Uint16>(gmenu2x->font->getTextWidth(label)), static_cast<Uint16>(gmenu2x->font->getTextWidth(label)),
static_cast<Uint16>(gmenu2x->font->getHeight()) static_cast<Uint16>(gmenu2x->font->getLineSpacing())
}; };
w += margin + labelRect.w; w += margin + labelRect.w;
} }

2
src/inputdialog.cpp
View File

@ -145,7 +145,7 @@ void InputDialog::setKeyboard(int kb) {
bool InputDialog::exec() { bool InputDialog::exec() {
SDL_Rect box = { SDL_Rect box = {
0, 60, 0, static_cast<Uint16>(gmenu2x->font->getHeight() + 4) 0, 60, 0, static_cast<Uint16>(gmenu2x->font->getLineSpacing() + 4)
}; };
Uint32 caretTick = 0, curTick; Uint32 caretTick = 0, curTick;

2
src/link.cpp
View File

@ -158,7 +158,7 @@ void Link::setPosition(int x, int y) {
void Link::recalcCoordinates() { void Link::recalcCoordinates() {
iconX = rect.x+(rect.w-32)/2; iconX = rect.x+(rect.w-32)/2;
padding = (gmenu2x->skinConfInt["linkHeight"] - 32 - gmenu2x->font->getHeight()) / 3; padding = (gmenu2x->skinConfInt["linkHeight"] - 32 - gmenu2x->font->getLineSpacing()) / 3;
} }
void Link::run() { void Link::run() {

2
src/menu.cpp
View File

@ -205,7 +205,7 @@ void Menu::paint(Surface &s) {
// Paint section headers. // Paint section headers.
s.box(width / 2 - linkWidth / 2, 0, linkWidth, topBarHeight, selectionBgColor); s.box(width / 2 - linkWidth / 2, 0, linkWidth, topBarHeight, selectionBgColor);
const uint sectionLinkPadding = (topBarHeight - 32 - font.getHeight()) / 3; const uint sectionLinkPadding = (topBarHeight - 32 - font.getLineSpacing()) / 3;
const uint numSections = sections.size(); const uint numSections = sections.size();
for (int i = leftSection; i <= rightSection; i++) { for (int i = leftSection; i <= rightSection; i++) {
uint j = (centerSection + numSections + i) % numSections; uint j = (centerSection + numSections + i) % numSections;

10
src/messagebox.cpp
View File

@ -36,7 +36,7 @@ MessageBox::MessageBox(GMenu2X *gmenu2x, const string &text, const string &icon)
for (uint i = 0; i < BUTTON_TYPE_SIZE; i++) { for (uint i = 0; i < BUTTON_TYPE_SIZE; i++) {
buttons[i] = ""; buttons[i] = "";
buttonLabels[i] = ""; buttonLabels[i] = "";
buttonPositions[i].h = gmenu2x->font->getHeight(); buttonPositions[i].h = gmenu2x->font->getLineSpacing();
} }
//Default enabled button //Default enabled button
@ -65,7 +65,7 @@ int MessageBox::exec() {
bg.box(0, 0, gmenu2x->resX, gmenu2x->resY, 0,0,0,200); bg.box(0, 0, gmenu2x->resX, gmenu2x->resY, 0,0,0,200);
SDL_Rect box; SDL_Rect box;
box.h = gmenu2x->font->getHeight()*3 +4; box.h = gmenu2x->font->getLineSpacing()*3 +4;
box.w = gmenu2x->font->getTextWidth(text) + 24 + (gmenu2x->sc[icon] != NULL ? 37 : 0); box.w = gmenu2x->font->getTextWidth(text) + 24 + (gmenu2x->sc[icon] != NULL ? 37 : 0);
box.x = gmenu2x->halfX - box.w/2 -2; box.x = gmenu2x->halfX - box.w/2 -2;
box.y = gmenu2x->halfY - box.h/2 -2; box.y = gmenu2x->halfY - box.h/2 -2;
@ -73,12 +73,12 @@ int MessageBox::exec() {
//outer box //outer box
bg.box(box, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BG]); bg.box(box, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BG]);
//draw inner rectangle //draw inner rectangle
bg.rectangle(box.x+2, box.y+2, box.w-4, box.h-gmenu2x->font->getHeight(), bg.rectangle(box.x+2, box.y+2, box.w-4, box.h-gmenu2x->font->getLineSpacing(),
gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BORDER]); gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BORDER]);
//icon+text //icon+text
if (gmenu2x->sc[icon] != NULL) if (gmenu2x->sc[icon] != NULL)
gmenu2x->sc[icon]->blitCenter( &bg, box.x+25, box.y+gmenu2x->font->getHeight()+3 ); gmenu2x->sc[icon]->blitCenter( &bg, box.x+25, box.y+gmenu2x->font->getLineSpacing()+3 );
bg.write( gmenu2x->font, text, box.x+(gmenu2x->sc[icon] != NULL ? 47 : 10), box.y+gmenu2x->font->getHeight()+3, Font::HAlignLeft, Font::VAlignMiddle ); bg.write( gmenu2x->font, text, box.x+(gmenu2x->sc[icon] != NULL ? 47 : 10), box.y+gmenu2x->font->getLineSpacing()+3, Font::HAlignLeft, Font::VAlignMiddle );
int btnX = gmenu2x->halfX+box.w/2-6; int btnX = gmenu2x->halfX+box.w/2-6;
for (uint i = 0; i < BUTTON_TYPE_SIZE; i++) { for (uint i = 0; i < BUTTON_TYPE_SIZE; i++) {

2
src/selector.cpp
View File

@ -79,7 +79,7 @@ int Selector::exec(int startSelection) {
unsigned int top, height; unsigned int top, height;
tie(top, height) = gmenu2x->getContentArea(); tie(top, height) = gmenu2x->getContentArea();
int fontheight = gmenu2x->font->getHeight(); int fontheight = gmenu2x->font->getLineSpacing();
if (link->getSelectorBrowser()) if (link->getSelectorBrowser())
fontheight = constrain(fontheight, 20, 40); fontheight = constrain(fontheight, 20, 40);
unsigned int nb_elements = height / fontheight; unsigned int nb_elements = height / fontheight;

2
src/settingsdialog.cpp
View File

@ -70,7 +70,7 @@ bool SettingsDialog::exec() {
static_cast<Uint16>(gmenu2x->resX - 12), static_cast<Uint16>(gmenu2x->resX - 12),
static_cast<Uint16>(clipRect.h) static_cast<Uint16>(clipRect.h)
}; };
uint rowHeight = gmenu2x->font->getHeight() + 1; // gp2x=15+1 / pandora=19+1 uint rowHeight = gmenu2x->font->getLineSpacing() + 1; // gp2x=15+1 / pandora=19+1
uint numRows = (gmenu2x->resY - topBarHeight - 20) / rowHeight; uint numRows = (gmenu2x->resY - topBarHeight - 20) / rowHeight;
while (!close) { while (!close) {

4
src/textdialog.cpp
View File

@ -80,7 +80,7 @@ void TextDialog::preProcess() {
void TextDialog::drawText(vector<string> *text, unsigned int y, void TextDialog::drawText(vector<string> *text, unsigned int y,
unsigned int firstRow, unsigned int rowsPerPage) unsigned int firstRow, unsigned int rowsPerPage)
{ {
const int fontHeight = gmenu2x->font->getHeight(); const int fontHeight = gmenu2x->font->getLineSpacing();
for (unsigned i = firstRow; i < firstRow + rowsPerPage && i < text->size(); i++) { for (unsigned i = firstRow; i < firstRow + rowsPerPage && i < text->size(); i++) {
const string &line = text->at(i); const string &line = text->at(i);
@ -117,7 +117,7 @@ void TextDialog::exec() {
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();
const int fontHeight = gmenu2x->font->getHeight(); const int fontHeight = gmenu2x->font->getLineSpacing();
unsigned int contentY, contentHeight; unsigned int contentY, contentHeight;
tie(contentY, contentHeight) = gmenu2x->getContentArea(); tie(contentY, contentHeight) = gmenu2x->getContentArea();
const unsigned rowsPerPage = contentHeight / fontHeight; const unsigned rowsPerPage = contentHeight / fontHeight;

2
src/textmanualdialog.cpp
View File

@ -89,7 +89,7 @@ void TextManualDialog::exec() {
bg.convertToDisplayFormat(); bg.convertToDisplayFormat();
uint firstRow = 0, rowsPerPage = 180/gmenu2x->font->getHeight(); uint firstRow = 0, rowsPerPage = 180/gmenu2x->font->getLineSpacing();
stringstream ss; stringstream ss;
ss << pages.size(); ss << pages.size();
string spagecount; string spagecount;

2
src/wallpaperdialog.cpp
View File

@ -84,7 +84,7 @@ bool WallpaperDialog::exec()
unsigned int top, height; unsigned int top, height;
tie(top, height) = gmenu2x->getContentArea(); tie(top, height) = gmenu2x->getContentArea();
int fontheight = gmenu2x->font->getHeight(); int fontheight = gmenu2x->font->getLineSpacing();
unsigned int nb_elements = height / fontheight; unsigned int nb_elements = height / fontheight;
while (!close) { while (!close) {