libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DIRECTOR: implement text chunk fields operations

Browse Source
This commit is contained in:
ysj1173886760 2021-07-06 18:05:42 +08:00 committed by Eugene Sandulenko
parent 6e2a8fc08f
commit dc41917a74
3 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
engines/director/lingo/lingo-object.cpp
View File

@ -36,6 +36,7 @@
#include "director/lingo/xlibs/palxobj.h"
#include "director/lingo/xlibs/flushxobj.h"
#include "director/lingo/xlibs/winxobj.h"
#include "graphics/macgui/mactext.h"
namespace Director {
@ -999,21 +1000,38 @@ bool TextCastMember::hasChunkField(int field) {
Datum TextCastMember::getChunkField(int field, int start, int end) {
Datum d;
Graphics::MacText *macText = ((Graphics::MacText *)_widget);
if (!_widget)
warning("TextCastMember::getChunkField getting chunk field when there is no linked widget, returning the default value");
switch (field) {
case kTheForeColor:
d.u.i = getForeColor();
if (_widget)
d.u.i = macText->getTextColor(start, end);
else
d.u.i = getForeColor();
break;
case kTheTextFont:
d.u.i = _fontId;
if (_widget)
d.u.i = macText->getTextFont(start, end);
else
d.u.i = _fontId;
break;
case kTheTextHeight:
warning("TextCastMember::getChunkField getting text height(line spacing) is not implemented yet, returning the default one");
d.u.i = _lineSpacing;
break;
case kTheTextSize:
d.u.i = _fontSize;
if (_widget)
d.u.i = macText->getTextSize(start, end);
else
d.u.i = _fontSize;
break;
case kTheTextStyle:
d.u.i = _textSlant;
if (_widget)
d.u.i = macText->getTextSlant(start, end);
else
d.u.i = _textSlant;
break;
default:
break;
@ -1023,28 +1041,30 @@ Datum TextCastMember::getChunkField(int field, int start, int end) {
}
bool TextCastMember::setChunkField(int field, int start, int end, const Datum &d) {
uint color = 0;
Graphics::MacText *macText = ((Graphics::MacText *)_widget);
if (!_widget)
warning("TextCastMember::setChunkField setting chunk field when there is no linked widget");
switch (field) {
case kTheForeColor:
color = d.asInt();
setColors(&color, nullptr);
return false;
if (_widget)
macText->setTextColor(d.asInt(), start, end);
return true;
case kTheTextFont:
_fontId = d.asInt();
_modified = true;
return false;
if (_widget)
macText->setTextFont(d.asInt(), start, end);
return true;
case kTheTextHeight:
_lineSpacing = d.asInt();
_modified = true;
warning("TextCastMember::setChunkField setting text height(line spacing) is not implemented yet");
return false;
case kTheTextSize:
_fontSize = d.asInt();
_modified = true;
return false;
if (_widget)
macText->setTextSize(d.asInt(), start, end);
return true;
case kTheTextStyle:
_textSlant = d.asInt();
_modified = true;
return false;
if (_widget)
macText->setTextSlant(d.asInt(), start, end);
return true;
default:
break;
}

4
graphics/macgui/mactext.cpp
View File

@ -472,7 +472,7 @@ void setTextFontCallback(MacFontRun &macFontRun, int fontId) {
macFontRun.fontId = fontId;
}
void MacText::setTextFont(int start, int end, int fontId) {
void MacText::setTextFont(int fontId, int start, int end) {
setTextChunks(start, end, fontId, setTextFontCallback);
}
@ -480,7 +480,7 @@ void setTextSlantCallback(MacFontRun &macFontRun, int textSlant) {
macFontRun.textSlant = textSlant;
}
void MacText::setTextSlant(int start, int end, int textSlant) {
void MacText::setTextSlant(int textSlant, int start, int end) {
setTextChunks(start, end, textSlant, setTextSlantCallback);
}

4
graphics/macgui/mactext.h
View File

@ -206,10 +206,10 @@ public:
uint getTextColor(int start, int end);
int getTextFont(int start, int end);
void setTextFont(int start, int end, int fontId);
void setTextFont(int fontId, int start, int end);
int getTextSlant(int start, int end);
void setTextSlant(int start, int end, int textSlant);
void setTextSlant(int textSlant, int start, int end);
private:
MacFontRun getTextChunks(int start, int end);