diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:34:29 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:39:44 +0200 |
| commit | 01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6 (patch) | |
| tree | 544b07f3aa41abe7907bcd2040cdad11ebc324bb /engines/sci/graphics/controls.cpp | |
| parent | 9cf2c83e5e5a35816ab153bf8443dac691829ea8 (diff) | |
| parent | a41d72a44a660c72fdadbc3a8ef580e5e03cb890 (diff) | |
| download | scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.gz scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.tar.bz2 scummvm-rg350-01f3f3a8dd0ad2891939d03b0ce47cbf36ea9bc6.zip | |
Merge branch 'master'
Diffstat (limited to 'engines/sci/graphics/controls.cpp')
| -rw-r--r-- | engines/sci/graphics/controls.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/graphics/controls.cpp b/engines/sci/graphics/controls.cpp index 8d4712a969..a0750c7d3e 100644 --- a/engines/sci/graphics/controls.cpp +++ b/engines/sci/graphics/controls.cpp @@ -30,6 +30,7 @@ #include "sci/engine/kernel.h" #include "sci/engine/state.h" #include "sci/engine/selector.h" +#include "sci/graphics/compare.h" #include "sci/graphics/ports.h" #include "sci/graphics/paint16.h" #include "sci/graphics/font.h" @@ -230,8 +231,8 @@ void GfxControls::kernelTexteditChange(reg_t controlObject, reg_t eventObject) { if (textChanged) { GuiResourceId oldFontId = _text16->GetFontId(); GuiResourceId fontId = readSelectorValue(_segMan, controlObject, SELECTOR(font)); - rect = Common::Rect(readSelectorValue(_segMan, controlObject, SELECTOR(nsLeft)), readSelectorValue(_segMan, controlObject, SELECTOR(nsTop)), - readSelectorValue(_segMan, controlObject, SELECTOR(nsRight)), readSelectorValue(_segMan, controlObject, SELECTOR(nsBottom))); + rect = g_sci->_gfxCompare->getNSRect(controlObject); + _text16->SetFont(fontId); if (textAddChar) { |