libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 10:51:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: add text renderer and visual pos

Browse Source
This commit is contained in:
BLooperZ 2020-05-08 18:49:15 +03:00 committed by Eugene Sandulenko
parent 028e4be835
commit c39630ad53
4 changed files with 118 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
graphics/macgui/macmenu.cpp
View File

@ -33,6 +33,7 @@
#include "graphics/macgui/macwindowmanager.h"
#include "graphics/macgui/macwindow.h"
#include "graphics/macgui/macmenu.h"
#include "graphics/text_renderer.h"
namespace Graphics {
@ -746,11 +747,12 @@ static void underlineAccelerator(ManagedSurface *dst, const Font *font, const Co
if (shortcutPos == -1)
return;
Common::U32String s(str);
int visualPos = getVisualPosition(str, shortcutPos);
Common::U32String s = Common::convertBiDiU32String(str);
// Erase characters only if it is not end of the string
if ((uint)(shortcutPos + 1) < s.size())
s.erase(shortcutPos + 1);
if ((uint)(visualPos + 1) < s.size())
s.erase(visualPos + 1);
int pos2 = font->getStringWidth(s);
s.deleteLastChar();
@ -821,20 +823,17 @@ bool MacMenu::draw(ManagedSurface *g, bool forceRedraw) {
int y = it->bbox.top + (_wm->_fontMan->hasBuiltInFonts() ? 2 : 1);
if (it->unicode) {
Common::U32String line = convertBiDiU32String(it->unicodeText);
// Common::U32String line = convertBiDiU32String(it->unicodeText);
int accOff = line == it->unicodeText ? 0 : _font->getStringWidth(line);
if (_align == kTextAlignRight) {
accOff += it->bbox.width() - kMenuLeftMargin - _font->getStringWidth(line);
}
int accOff = _align == kTextAlignRight ? it->bbox.width() - _font->getStringWidth(it->unicodeText) : 0;
// FLIP ON RENDER
// if (_align == kTextAlignRight) {
// x = r.right + r.left - it->bbox.width() - x;
// }
_font->drawString(&_screen, line, x, y, it->bbox.width(), color, _align);
underlineAccelerator(&_screen, _font, line, x + accOff, y, it->shortcutPos, color);
TextRenderer::drawU32String(&_screen, it->unicodeText, *_font, x, y, it->bbox.width(), color, _align);
underlineAccelerator(&_screen, _font, it->unicodeText, x + accOff, y, it->shortcutPos, color);
} else {
const Font *font = getMenuFont(it->style);
@ -867,17 +866,10 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu, bool recursive) {
_screen.fillRect(*r, _wm->_colorWhite);
_screen.frameRect(*r, _wm->_colorBlack);
if (_align != kTextAlignRight) {
_screen.vLine(r->right, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.vLine(r->right + 1, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.hLine(r->left + 3, r->bottom, r->right + 1, _wm->_colorBlack);
_screen.hLine(r->left + 3, r->bottom + 1, r->right + 1, _wm->_colorBlack);
} else {
_screen.vLine(r->left, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.vLine(r->left - 1, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.hLine(r->left - 3, r->bottom, r->right - 1, _wm->_colorBlack);
_screen.hLine(r->left - 3, r->bottom + 1, r->right - 1, _wm->_colorBlack);
}
_screen.vLine(r->right, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.vLine(r->right + 1, r->top + 3, r->bottom + 1, _wm->_colorBlack);
_screen.hLine(r->left + 3, r->bottom, r->right + 1, _wm->_colorBlack);
_screen.hLine(r->left + 3, r->bottom + 1, r->right + 1, _wm->_colorBlack);
int x = r->left + kMenuDropdownPadding;
int y = r->top + 1;
@ -890,12 +882,11 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu, bool recursive) {
Common::String text(menu->items[i]->text);
Common::String acceleratorText(getAcceleratorString(menu->items[i], ""));
Common::U32String unicodeText = convertBiDiU32String(menu->items[i]->unicodeText);
// Common::U32String unicodeText = convertBiDiU32String(menu->items[i]->unicodeText);
Common::U32String unicodeText(menu->items[i]->unicodeText);
int accOff = _align == kTextAlignRight ? r->width() - _font->getStringWidth(unicodeText) : 0;
int accOff = unicodeText == menu->items[i]->unicodeText ? 0 : _font->getStringWidth(unicodeText);
if (_align == kTextAlignRight) {
accOff += r->width() - kMenuDropdownPadding - _font->getStringWidth(unicodeText);
}
int shortcutPos = menu->items[i]->shortcutPos;
@ -929,7 +920,7 @@ void MacMenu::renderSubmenu(MacMenuSubMenu *menu, bool recursive) {
}
if (menu->items[i]->unicode) {
_font->drawString(s, unicodeText, tx, ty, r->width(), color, _align);
TextRenderer::drawU32String(s, unicodeText, *_font, tx, ty, r->width(), color, _align);
underlineAccelerator(s, _font, unicodeText, tx + accOff, ty, shortcutPos, color);
} else {
const Font *font = getMenuFont(menu->items[i]->style);

1
graphics/module.mk
View File

@ -32,6 +32,7 @@ MODULE_OBJS := \
screen.o \
sjis.o \
surface.o \
text_renderer.o \
transform_struct.o \
transform_tools.o \
transparent_surface.o \

52
graphics/text_renderer.cpp Normal file
View File

@ -0,0 +1,52 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#include "common/str-bidi.h"
#include "graphics/text_renderer.h"
#ifdef USE_FRIBIDI
#include <fribidi/fribidi.h>
#endif
namespace Graphics {
namespace TextRenderer {
void drawString(Surface *dst, const Common::String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, const Common::CodePage page, TextAlign align, int deltax, bool useEllipsis) {
font.drawString(dst, convertBiDiString(str, page), x, y, w, color, align, deltax, useEllipsis);
}
void drawU32String(Surface *dst, const Common::U32String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, TextAlign align, int deltax) {
font.drawString(dst, convertBiDiU32String(str), x, y, w, color, align, deltax);
}
void drawString(ManagedSurface *dst, const Common::String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, const Common::CodePage page, TextAlign align, int deltax, bool useEllipsis) {
font.drawString(dst, convertBiDiString(str, page), x, y, w, color, align, deltax, useEllipsis);
}
void drawU32String(ManagedSurface *dst, const Common::U32String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, TextAlign align, int deltax) {
font.drawString(dst, convertBiDiU32String(str), x, y, w, color, align, deltax);
}
} // End of namespace TextRenderer
} // End of namespace Graphics

47
graphics/text_renderer.h Normal file
View File

@ -0,0 +1,47 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef GRAPHICS_TEXT_RENDERER_H
#define GRAPHICS_TEXT_RENDERER_H
#include "common/str.h"
#include "common/ustr.h"
#include "common/str-bidi.h"
#include "graphics/font.h"
namespace Graphics {
/**
* high-level methods for drawing strings (with bidi support).
*/
namespace TextRenderer {
// TODO: Add doxygen comments to this
void drawString(Surface *dst, const Common::String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, const Common::CodePage page, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
void drawU32String(Surface *dst, const Common::U32String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0);
void drawString(ManagedSurface *dst, const Common::String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, const Common::CodePage page, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
void drawU32String(ManagedSurface *dst, const Common::U32String &str, const Graphics::Font &font, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0);
}
} // End of namespace Graphics
#endif