diff options
| author | Eugene Sandulenko | 2020-01-03 00:49:48 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2020-01-03 00:50:24 +0100 |
| commit | d9f6a0cf4d6a5765b73814738ca7662e1adea2cd (patch) | |
| tree | 7af73bb8938e378bfa211fcd56b0a90ae39e23e8 /graphics/macgui/maceditabletext.cpp | |
| parent | c3c23c28a194ac5e3a2b74d42530d8b05824b091 (diff) | |
| download | scummvm-rg350-d9f6a0cf4d6a5765b73814738ca7662e1adea2cd.tar.gz scummvm-rg350-d9f6a0cf4d6a5765b73814738ca7662e1adea2cd.tar.bz2 scummvm-rg350-d9f6a0cf4d6a5765b73814738ca7662e1adea2cd.zip | |
GRAPHICS: MACGUI: Further work on MacEditableText
Diffstat (limited to 'graphics/macgui/maceditabletext.cpp')
| -rw-r--r-- | graphics/macgui/maceditabletext.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/graphics/macgui/maceditabletext.cpp b/graphics/macgui/maceditabletext.cpp index 5295566b11..b5aa7ecbc9 100644 --- a/graphics/macgui/maceditabletext.cpp +++ b/graphics/macgui/maceditabletext.cpp @@ -45,8 +45,8 @@ enum { static void cursorTimerHandler(void *refCon); -MacEditableText::MacEditableText(Common::U32String s, MacWindow *parent, const MacFont *macFont, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, int interlinear) : - MacText(s, parent->_wm, macFont, fgcolor, bgcolor, maxWidth, textAlignment, interlinear), MacWidget(0, true, parent) { +MacEditableText::MacEditableText(MacWindow *parent, int x, int y, int w, int h, Common::U32String s, const MacFont *macFont, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, int interlinear) : + MacWidget(parent, x, y, w, h, true), MacText(s, parent->_wm, macFont, fgcolor, bgcolor, maxWidth, textAlignment, interlinear) { _parent = parent; _maxWidth = maxWidth; @@ -54,8 +54,8 @@ MacEditableText::MacEditableText(Common::U32String s, MacWindow *parent, const M init(); } -MacEditableText::MacEditableText(const Common::String &s, MacWindow *parent, const MacFont *macFont, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, int interlinear) : - MacText(s, parent->_wm, macFont, fgcolor, bgcolor, maxWidth, textAlignment, interlinear), MacWidget(0, true, parent) { +MacEditableText::MacEditableText(MacWindow *parent, int x, int y, int w, int h, const Common::String &s, const MacFont *macFont, int fgcolor, int bgcolor, int maxWidth, TextAlign textAlignment, int interlinear) : + MacWidget(parent, x, y, w, h, true), MacText(s, parent->_wm, macFont, fgcolor, bgcolor, maxWidth, textAlignment, interlinear) { _parent = parent; _maxWidth = maxWidth; @@ -132,7 +132,7 @@ void MacEditableText::clearText() { updateCursorPos(); } -void MacEditableText::setTextWindowFont(const MacFont *font) { +void MacEditableText::setTextFont(const MacFont *font) { _font = font; _fontRef = _wm->_fontMan->getFont(*font); @@ -140,7 +140,7 @@ void MacEditableText::setTextWindowFont(const MacFont *font) { MacText::setDefaultFormatting(font->getId(), font->getSlant(), font->getSize(), 0, 0, 0); } -const MacFont *MacEditableText::getTextWindowFont() { +const MacFont *MacEditableText::getTextFont() { return _font; } @@ -299,7 +299,8 @@ bool MacEditableText::processEvent(Common::Event &event) { if (!_editable) return false; - _wm->setActive(getId()); + // Make the parent window active + _wm->setActive(_parent->getId()); if (event.kbd.flags & (Common::KBD_ALT | Common::KBD_CTRL | Common::KBD_META)) { return false; |