diff options
| author | Norbert Lange | 2009-07-17 21:23:54 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-17 21:23:54 +0000 |
| commit | bb64bf008d03e01760a468d0df8cacb164725d41 (patch) | |
| tree | d73710df5b07f3fa1ca30e719c1c1f58ebe0b107 /gui/console.cpp | |
| parent | 81ac29ebca30c352646a5b21de512087cb96a672 (diff) | |
| parent | 53756ef1d022a959b24c041e18f55eef34e60dd3 (diff) | |
| download | scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.gz scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.tar.bz2 scummvm-rg350-bb64bf008d03e01760a468d0df8cacb164725d41.zip | |
merge with trunk
svn-id: r42574
Diffstat (limited to 'gui/console.cpp')
| -rw-r--r-- | gui/console.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gui/console.cpp b/gui/console.cpp index e33aa9d9fe..498d1767a6 100644 --- a/gui/console.cpp +++ b/gui/console.cpp @@ -112,6 +112,7 @@ void ConsoleDialog::init() { _w = _w - _w / 20; _h = _h * kConsoleLineHeight + 2; + _x = _w / 40; // Set scrollbar dimensions int scrollBarWidth = g_gui.xmlEval()->getVar("Globals.Scrollbar.Width", 0); @@ -149,8 +150,8 @@ void ConsoleDialog::open() { if (_w != w || _h != h) init(); - _x = _w / 40; _y = -_h; + _slideTime = g_system->getMillis(); _slideMode = kDownSlideMode; |