diff options
| author | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-07-26 19:48:14 -0400 |
| commit | 504cf6ecb688a3f1c65a857bffd527d8b0e6ba63 (patch) | |
| tree | 0c0d96d4061c11850c851f0fc981c75a58c20515 /gui/gui-manager.h | |
| parent | d8c28d15ae553d047b7e571f98727fa79ee143f3 (diff) | |
| parent | e19922d181e775791f9105b8be7ff410770ede51 (diff) | |
| download | scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.gz scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.tar.bz2 scummvm-rg350-504cf6ecb688a3f1c65a857bffd527d8b0e6ba63.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'gui/gui-manager.h')
| -rw-r--r-- | gui/gui-manager.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gui/gui-manager.h b/gui/gui-manager.h index 4186a93ccb..4dc9af95fb 100644 --- a/gui/gui-manager.h +++ b/gui/gui-manager.h @@ -73,6 +73,7 @@ public: void runLoop(); void processEvent(const Common::Event &event, Dialog *const activeDialog); + void doFullRedraw(); bool isActive() const { return ! _dialogStack.empty(); } @@ -98,6 +99,8 @@ public: */ bool checkScreenChange(); + bool _launched; + protected: enum RedrawStatus { kRedrawDisabled = 0, @@ -122,11 +125,12 @@ protected: bool _useStdCursor; // position and time of last mouse click (used to detect double clicks) - struct { + struct MousePos { + MousePos() : x(-1), y(-1), count(0) { time = 0; } int16 x, y; // Position of mouse when the click occurred uint32 time; // Time int count; // How often was it already pressed? - } _lastClick, _lastMousePosition; + } _lastClick, _lastMousePosition, _globalMousePosition; // mouse cursor state int _cursorAnimateCounter; @@ -153,6 +157,9 @@ protected: Dialog *getTopDialog() const; void screenChange(); + + void giveFocusToDialog(Dialog *dialog); + void setLastMousePos(int16 x, int16 y); }; } // End of namespace GUI |