Skip to content

Commit

Permalink
Renamed Graphics::TextAlignment -> Graphics::TextAlign and merged it …
Browse files Browse the repository at this point in the history 
…with GUI::ThemeEngine::TextAlignVertical

svn-id: r35023
  • Loading branch information
@fingolfin
fingolfin committed Nov 12, 2008
1 parent 144be21 commit c0f82d3
Show file tree
Hide file tree
Showing 22 changed files with 64 additions and 114 deletions.
10 changes: 4 additions & 6 deletions engines/dialogs.cpp
View file
Expand Up @@ -49,8 +49,6 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
using GUI::kCloseCmd;
using GUI::kTextAlignCenter;
using GUI::kTextAlignLeft;
using GUI::WIDGET_ENABLED;

typedef GUI::OptionsDialog GUI_OptionsDialog;
Expand Down Expand Up @@ -80,15 +78,15 @@ MainMenuDialog::MainMenuDialog(Engine *engine)
_logo->setGfx(g_gui.theme()->getImageSurface(GUI::ThemeEngine::kImageLogoSmall));
} else {
StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(GUI::kTextAlignCenter);
title->setAlign(Graphics::kTextAlignCenter);
}
#else
StaticTextWidget *title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(GUI::kTextAlignCenter);
title->setAlign(Graphics::kTextAlignCenter);
#endif

StaticTextWidget *version = new StaticTextWidget(this, "GlobalMenu.Version", gScummVMVersionDate);
version->setAlign(GUI::kTextAlignCenter);
version->setAlign(Graphics::kTextAlignCenter);

new GUI::ButtonWidget(this, "GlobalMenu.Resume", "Resume", kPlayCmd, 'P');

Expand Down Expand Up @@ -223,7 +221,7 @@ void MainMenuDialog::reflowLayout() {
GUI::StaticTextWidget *title = (StaticTextWidget *)findWidget("GlobalMenu.Title");
if (!title) {
title = new StaticTextWidget(this, "GlobalMenu.Title", "ScummVM");
title->setAlign(GUI::kTextAlignCenter);
title->setAlign(Graphics::kTextAlignCenter);
}

if (_logo) {
Expand Down
6 changes: 3 additions & 3 deletions engines/parallaction/saveload.cpp
View file
Expand Up @@ -259,9 +259,9 @@ SaveLoadChooser::SaveLoadChooser(const String &title, const String &buttonLabel)

_gfxWidget = new GUI::GraphicsWidget(this, 0, 0, 10, 10);

_date = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No date saved", GUI::kTextAlignCenter);
_time = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No time saved", GUI::kTextAlignCenter);
_playtime = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No playtime saved", GUI::kTextAlignCenter);
_date = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No date saved", Graphics::kTextAlignCenter);
_time = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No time saved", Graphics::kTextAlignCenter);
_playtime = new GUI::StaticTextWidget(this, 0, 0, 10, 10, "No playtime saved", Graphics::kTextAlignCenter);

// Buttons
new GUI::ButtonWidget(this, "ScummSaveLoad.Cancel", "Cancel", GUI::kCloseCmd, 0);
Expand Down
4 changes: 2 additions & 2 deletions engines/scumm/dialogs.cpp
View file
Expand Up @@ -62,8 +62,8 @@
using GUI::CommandSender;
using GUI::StaticTextWidget;
using GUI::kCloseCmd;
using GUI::kTextAlignCenter;
using GUI::kTextAlignLeft;
using Graphics::kTextAlignCenter;
using Graphics::kTextAlignLeft;
using GUI::WIDGET_ENABLED;

typedef GUI::OptionsDialog GUI_OptionsDialog;
Expand Down
2 changes: 1 addition & 1 deletion graphics/VectorRenderer.h
View file
Expand Up @@ -507,7 +507,7 @@ class VectorRenderer {
* method.
*/
virtual void drawString(const Graphics::Font *font, const Common::String &text,
const Common::Rect &area, GUI::ThemeEngine::TextAlign alignH,
const Common::Rect &area, Graphics::TextAlign alignH,
GUI::ThemeEngine::TextAlignVertical alignV, int deltax, bool useEllipsis) = 0;

/**
Expand Down
4 changes: 2 additions & 2 deletions graphics/VectorRendererSpec.cpp
View file
Expand Up @@ -449,7 +449,7 @@ colorFill(PixelType *first, PixelType *last, PixelType color) {
template <typename PixelType, typename PixelFormat>
void VectorRendererSpec<PixelType, PixelFormat>::
drawString(const Graphics::Font *font, const Common::String &text, const Common::Rect &area,
GUI::ThemeEngine::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV, int deltax, bool ellipsis) {
Graphics::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV, int deltax, bool ellipsis) {

int offset = area.top;

Expand All @@ -466,7 +466,7 @@ drawString(const Graphics::Font *font, const Common::String &text, const Common:
}
}

font->drawString(_activeSurface, text, area.left, offset, area.width(), _fgColor, (Graphics::TextAlignment)alignH, deltax, ellipsis);
font->drawString(_activeSurface, text, area.left, offset, area.width(), _fgColor, alignH, deltax, ellipsis);
}

/** LINES **/
Expand Down
2 changes: 1 addition & 1 deletion graphics/VectorRendererSpec.h
View file
Expand Up @@ -68,7 +68,7 @@ class VectorRendererSpec : public VectorRenderer {
drawBevelSquareAlg(x, y, w, h, bevel, _bevelColor, _fgColor, Base::_fillMode != kFillDisabled);
}
void drawString(const Graphics::Font *font, const Common::String &text,
const Common::Rect &area, GUI::ThemeEngine::TextAlign alignH,
const Common::Rect &area, Graphics::TextAlign alignH,
GUI::ThemeEngine::TextAlignVertical alignV, int deltax, bool elipsis);

void setFgColor(uint8 r, uint8 g, uint8 b) { _fgColor = RGBToColor<PixelFormat>(r, g, b); }
Expand Down
2 changes: 1 addition & 1 deletion graphics/font.cpp
View file
Expand Up @@ -772,7 +772,7 @@ int Font::getStringWidth(const Common::String &str) const {
return space;
}

void Font::drawString(Surface *dst, const Common::String &s, int x, int y, int w, uint32 color, TextAlignment align, int deltax, bool useEllipsis) const {
void Font::drawString(Surface *dst, const Common::String &s, int x, int y, int w, uint32 color, TextAlign align, int deltax, bool useEllipsis) const {
assert(dst != 0);
const int leftX = x, rightX = x + w;
uint i;
Expand Down
12 changes: 6 additions & 6 deletions graphics/font.h
View file
Expand Up @@ -34,11 +34,11 @@ class SeekableReadStream;

namespace Graphics {

// Text alignment modes for drawString()
enum TextAlignment {
kTextAlignLeft,
kTextAlignCenter,
kTextAlignRight
/** Text alignment modes */
enum TextAlign {
kTextAlignLeft, //!< Text should be aligned to the left
kTextAlignCenter, //!< Text should be centered
kTextAlignRight //!< Text should be aligned to the right
};

/**
Expand All @@ -57,7 +57,7 @@ class Font {
virtual int getCharWidth(byte chr) const = 0;
virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const = 0;

void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
void drawString(Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlign align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;

/**
* Compute and return the width the string str has when rendered using this font.
Expand Down
2 changes: 1 addition & 1 deletion gui/EditTextWidget.cpp
View file
Expand Up @@ -86,7 +86,7 @@ void EditTextWidget::drawWidget() {

// Draw the text
adjustOffset();
g_gui.theme()->drawText(Common::Rect(_x+2+ _leftPadding,_y+2, _x+_leftPadding+getEditRect().width()+2, _y+_h-2), _editString, _state, ThemeEngine::kTextAlignLeft, false, -_editScrollOffset, false, _font);
g_gui.theme()->drawText(Common::Rect(_x+2+ _leftPadding,_y+2, _x+_leftPadding+getEditRect().width()+2, _y+_h-2), _editString, _state, Graphics::kTextAlignLeft, false, -_editScrollOffset, false, _font);
}

Common::Rect EditTextWidget::getEditRect() const {
Expand Down
6 changes: 3 additions & 3 deletions gui/ListWidget.cpp
View file
Expand Up @@ -387,7 +387,7 @@ void ListWidget::drawWidget() {
sprintf(temp, "%2d. ", (pos + _numberingMode));
buffer = temp;
g_gui.theme()->drawText(Common::Rect(_x, y, _x + r.left + _leftPadding, y + fontHeight - 2),
buffer, _state, ThemeEngine::kTextAlignLeft, inverted, _leftPadding);
buffer, _state, Graphics::kTextAlignLeft, inverted, _leftPadding);
pad = 0;
}

Expand All @@ -398,7 +398,7 @@ void ListWidget::drawWidget() {
adjustOffset();
width = _w - r.left - _hlRightPadding - _leftPadding - scrollbarW;
g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight-2),
buffer, _state, ThemeEngine::kTextAlignLeft, inverted, pad);
buffer, _state, Graphics::kTextAlignLeft, inverted, pad);
} else {
int maxWidth = _textWidth[i];
buffer = _list[pos];
Expand All @@ -411,7 +411,7 @@ void ListWidget::drawWidget() {
if (width > maxWidth)
maxWidth = width;
g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + maxWidth, y + fontHeight-2),
buffer, _state, ThemeEngine::kTextAlignLeft, inverted, pad);
buffer, _state, Graphics::kTextAlignLeft, inverted, pad);
}

_textWidth[i] = width;
Expand Down
6 changes: 3 additions & 3 deletions gui/PopUpWidget.cpp
View file
Expand Up @@ -345,7 +345,7 @@ void PopUpDialog::drawMenuEntry(int entry, bool hilite) {
g_gui.theme()->drawLineSeparator(Common::Rect(x, y, x+w, y+kLineHeight));
} else {
g_gui.theme()->drawText(Common::Rect(x+1, y+2, x+w, y+2+kLineHeight), name, hilite ? ThemeEngine::kStateHighlight : ThemeEngine::kStateEnabled,
ThemeEngine::kTextAlignLeft, false, _leftPadding);
Graphics::kTextAlignLeft, false, _leftPadding);
}
}

Expand Down Expand Up @@ -425,12 +425,12 @@ void PopUpWidget::drawWidget() {

// Draw the label, if any
if (_labelWidth > 0)
g_gui.theme()->drawText(Common::Rect(_x+2,_y+3,_x+2+_labelWidth, _y+3+g_gui.theme()->getFontHeight()), _label, _state, ThemeEngine::kTextAlignRight);
g_gui.theme()->drawText(Common::Rect(_x+2,_y+3,_x+2+_labelWidth, _y+3+g_gui.theme()->getFontHeight()), _label, _state, Graphics::kTextAlignRight);

Common::String sel;
if (_selectedItem >= 0)
sel = _entries[_selectedItem].name;
g_gui.theme()->drawPopUpWidget(Common::Rect(x, _y, x+w, _y+_h), sel, _leftPadding, _state, g_gui.theme()->convertAligment(kTextAlignLeft));
g_gui.theme()->drawPopUpWidget(Common::Rect(x, _y, x+w, _y+_h), sel, _leftPadding, _state, Graphics::kTextAlignLeft);
}

} // End of namespace GUI
6 changes: 3 additions & 3 deletions gui/ThemeData.h
View file
Expand Up @@ -42,7 +42,7 @@ struct WidgetDrawData {
Common::List<Graphics::DrawStep> _steps;

int _textDataId;
GUI::ThemeEngine::TextAlign _textAlignH;
Graphics::TextAlign _textAlignH;
GUI::ThemeEngine::TextAlignVertical _textAlignV;

/** Extra space that the widget occupies when it's drawn.
Expand Down Expand Up @@ -96,7 +96,7 @@ class ThemeItemDrawData : public ThemeItem {
class ThemeItemTextData : public ThemeItem {
public:
ThemeItemTextData(ThemeEngine *engine, const TextDrawData *data, const Common::Rect &area, const Common::String &text,
GUI::ThemeEngine::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV,
Graphics::TextAlign alignH, GUI::ThemeEngine::TextAlignVertical alignV,
bool ellipsis, bool restoreBg, int deltaX) :
ThemeItem(engine, area), _data(data), _text(text), _alignH(alignH), _alignV(alignV),
_ellipsis(ellipsis), _restoreBg(restoreBg), _deltax(deltaX) {}
Expand All @@ -106,7 +106,7 @@ class ThemeItemTextData : public ThemeItem {
protected:
const TextDrawData *_data;
Common::String _text;
GUI::ThemeEngine::TextAlign _alignH;
Graphics::TextAlign _alignH;
GUI::ThemeEngine::TextAlignVertical _alignV;
bool _ellipsis;
bool _restoreBg;
Expand Down
8 changes: 4 additions & 4 deletions gui/ThemeEngine.cpp
View file
Expand Up @@ -350,7 +350,7 @@ void ThemeEngine::addDrawStep(const Common::String &drawDataId, const Graphics::
_widgets[id]->_steps.push_back(step);
}

bool ThemeEngine::addTextData(const Common::String &drawDataId, const Common::String &textDataId, TextAlign alignH, TextAlignVertical alignV) {
bool ThemeEngine::addTextData(const Common::String &drawDataId, const Common::String &textDataId, Graphics::TextAlign alignH, TextAlignVertical alignV) {
DrawData id = getDrawDataId(drawDataId);
TextData textId = getTextDataId(textDataId);

Expand Down Expand Up @@ -601,7 +601,7 @@ void ThemeEngine::queueDD(DrawData type, const Common::Rect &r, uint32 dynamic)
}

void ThemeEngine::queueDDText(TextData type, const Common::Rect &r, const Common::String &text, bool restoreBg,
bool ellipsis, TextAlign alignH, TextAlignVertical alignV, int deltax) {
bool ellipsis, Graphics::TextAlign alignH, TextAlignVertical alignV, int deltax) {

if (_texts[type] == 0)
return;
Expand Down Expand Up @@ -771,7 +771,7 @@ void ThemeEngine::drawCaret(const Common::Rect &r, bool erase, WidgetStateInfo s
queueDD(kDDCaret, r);
}

void ThemeEngine::drawPopUpWidget(const Common::Rect &r, const Common::String &sel, int deltax, WidgetStateInfo state, TextAlign align) {
void ThemeEngine::drawPopUpWidget(const Common::Rect &r, const Common::String &sel, int deltax, WidgetStateInfo state, Graphics::TextAlign align) {
if (!ready())
return;

Expand Down Expand Up @@ -842,7 +842,7 @@ void ThemeEngine::drawTab(const Common::Rect &r, int tabHeight, int tabWidth, co
}
}

void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font) {
void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state, Graphics::TextAlign align, bool inverted, int deltax, bool useEllipsis, FontStyle font) {
if (!ready())
return;

Expand Down
52 changes: 6 additions & 46 deletions gui/ThemeEngine.h
View file
Expand Up @@ -35,8 +35,8 @@
#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.3"

namespace Graphics {
struct DrawStep;
class VectorRenderer;
struct DrawStep;
class VectorRenderer;
}

namespace GUI {
Expand Down Expand Up @@ -138,13 +138,6 @@ class ThemeEngine {
} kTextDataDefaults[];

public:
//! Defined the align of the text
enum TextAlign {
kTextAlignLeft, //!< Text should be aligned to the left
kTextAlignCenter, //!< Text should be centered
kTextAlignRight //!< Text should be aligned to the right
};

//! Vertical alignment of the text.
enum TextAlignVertical {
kTextAlignVBottom,
Expand Down Expand Up @@ -336,7 +329,7 @@ class ThemeEngine {
ScrollbarState, WidgetStateInfo state = kStateEnabled);

void drawPopUpWidget(const Common::Rect &r, const Common::String &sel,
int deltax, WidgetStateInfo state = kStateEnabled, TextAlign align = kTextAlignLeft);
int deltax, WidgetStateInfo state = kStateEnabled, Graphics::TextAlign align = Graphics::kTextAlignLeft);

void drawCaret(const Common::Rect &r, bool erase,
WidgetStateInfo state = kStateEnabled);
Expand All @@ -345,7 +338,7 @@ class ThemeEngine {

void drawDialogBackground(const Common::Rect &r, DialogBackground type, WidgetStateInfo state = kStateEnabled);

void drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state = kStateEnabled, TextAlign align = kTextAlignCenter, bool inverted = false, int deltax = 0, bool useEllipsis = true, FontStyle font = kFontStyleBold);
void drawText(const Common::Rect &r, const Common::String &str, WidgetStateInfo state = kStateEnabled, Graphics::TextAlign align = Graphics::kTextAlignCenter, bool inverted = false, int deltax = 0, bool useEllipsis = true, FontStyle font = kFontStyleBold);

void drawChar(const Common::Rect &r, byte ch, const Graphics::Font *font, WidgetStateInfo state = kStateEnabled);

Expand Down Expand Up @@ -436,7 +429,7 @@ class ThemeEngine {
* Adds a new TextStep from the ThemeParser. This will be deprecated/removed once the
* new Font API is in place.
*/
bool addTextData(const Common::String &drawDataId, const Common::String &textDataId, TextAlign alignH, TextAlignVertical alignV);
bool addTextData(const Common::String &drawDataId, const Common::String &textDataId, Graphics::TextAlign alignH, TextAlignVertical alignV);

/**
* Returns if the Theme is ready to draw stuff on screen.
Expand Down Expand Up @@ -615,7 +608,7 @@ class ThemeEngine {
*/
void queueDD(DrawData type, const Common::Rect &r, uint32 dynamic = 0);
void queueDDText(TextData type, const Common::Rect &r, const Common::String &text, bool restoreBg,
bool elipsis, TextAlign alignH = kTextAlignLeft, TextAlignVertical alignV = kTextAlignVTop, int deltax = 0);
bool elipsis, Graphics::TextAlign alignH = Graphics::kTextAlignLeft, TextAlignVertical alignV = kTextAlignVTop, int deltax = 0);
void queueBitmap(const Graphics::Surface *bitmap, const Common::Rect &r, bool alpha);

/**
Expand All @@ -638,39 +631,6 @@ class ThemeEngine {
const Graphics::Font *loadFontFromArchive(const Common::String &filename);
Common::String genCacheFilename(const char *filename);

Graphics::TextAlignment convertAligment(TextAlign align) const {
switch (align) {
case kTextAlignLeft:
return Graphics::kTextAlignLeft;
break;

case kTextAlignRight:
return Graphics::kTextAlignRight;
break;

default:
break;
};
return Graphics::kTextAlignCenter;
}

TextAlign convertAligment(Graphics::TextAlignment align) const {
switch (align) {
case Graphics::kTextAlignLeft:
return kTextAlignLeft;
break;

case Graphics::kTextAlignRight:
return kTextAlignRight;
break;

default:
break;
}
return kTextAlignCenter;
}


bool isThemeLoadingRequired();

static bool themeConfigUseable(const Common::FSNode &node, Common::String &themeName);
Expand Down
8 changes: 4 additions & 4 deletions gui/ThemeParser.cpp
View file
Expand Up @@ -177,15 +177,15 @@ bool ThemeParser::parserCallback_bitmap(ParserNode *node) {
}

bool ThemeParser::parserCallback_text(ParserNode *node) {
GUI::ThemeEngine::TextAlign alignH;
Graphics::TextAlign alignH;
GUI::ThemeEngine::TextAlignVertical alignV;

if (node->values["horizontal_align"] == "left")
alignH = GUI::ThemeEngine::kTextAlignLeft;
alignH = Graphics::kTextAlignLeft;
else if (node->values["horizontal_align"] == "right")
alignH = GUI::ThemeEngine::kTextAlignRight;
alignH = Graphics::kTextAlignRight;
else if (node->values["horizontal_align"] == "center")
alignH = GUI::ThemeEngine::kTextAlignCenter;
alignH = Graphics::kTextAlignCenter;
else return parserError("Invalid value for text alignment.");

if (node->values["vertical_align"] == "top")
Expand Down

0 comments on commit c0f82d3

Please sign in to comment.