diff options
author | Einar Johan Trøan Sømåen | 2013-09-30 11:18:54 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-09-30 11:18:54 +0200 |
commit | 12e7cb401f80d8e1dee1af67817333d897508dfb (patch) | |
tree | 08c5b4452ce79d6118304725ecdaed5b2a20a824 /engines/wintermute/ui | |
parent | 15d98724d85b33d9918125999d6f654736ef10af (diff) | |
download | scummvm-rg350-12e7cb401f80d8e1dee1af67817333d897508dfb.tar.gz scummvm-rg350-12e7cb401f80d8e1dee1af67817333d897508dfb.tar.bz2 scummvm-rg350-12e7cb401f80d8e1dee1af67817333d897508dfb.zip |
WINTERMUTE: Formatting with Astyle (UIButton, UIEdit, UIObject, UIWindow, TransparentSurface)
Diffstat (limited to 'engines/wintermute/ui')
-rw-r--r-- | engines/wintermute/ui/ui_button.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/ui/ui_button.h | 4 | ||||
-rw-r--r-- | engines/wintermute/ui/ui_edit.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/ui/ui_object.cpp | 2 | ||||
-rw-r--r-- | engines/wintermute/ui/ui_object.h | 2 | ||||
-rw-r--r-- | engines/wintermute/ui/ui_window.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp index cc4f76c259..66cee8a50c 100644 --- a/engines/wintermute/ui/ui_button.cpp +++ b/engines/wintermute/ui/ui_button.cpp @@ -660,7 +660,7 @@ bool UIButton::display(int offsetX, int offsetY) { _hover = (!_disable && _gameRef->_activeObject == this && (_gameRef->_interactive || _gameRef->_state == GAME_SEMI_FROZEN)); if ((_press && _hover && !_gameRef->_mouseLeftDown) || - (_oneTimePress && g_system->getMillis() - _oneTimePressTime >= 100)) { + (_oneTimePress && g_system->getMillis() - _oneTimePressTime >= 100)) { press(); } diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h index e5dc25bdf0..542a50d35a 100644 --- a/engines/wintermute/ui/ui_button.h +++ b/engines/wintermute/ui/ui_button.h @@ -57,11 +57,11 @@ public: virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override; virtual const char *scToString() override; - + void setFontHover(BaseFont *font); BaseFont *getFontHover(); void setFontPress(BaseFont *font); - + void setTextAlign(TTextAlign align); void setImageHover(BaseSprite *sprite); diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp index caed157e0b..502685f0f1 100644 --- a/engines/wintermute/ui/ui_edit.cpp +++ b/engines/wintermute/ui/ui_edit.cpp @@ -627,9 +627,9 @@ bool UIEdit::display(int offsetX, int offsetY) { curFirst = true; } else { while (font->getTextWidth((byte *)_text + _scrollOffset, MAX<int32>(0, _selStart - _scrollOffset)) + - sfont->getTextWidth((byte *)(_text + MAX<int32>(_scrollOffset, _selStart)), _selEnd - MAX(_scrollOffset, _selStart)) + sfont->getTextWidth((byte *)(_text + MAX<int32>(_scrollOffset, _selStart)), _selEnd - MAX(_scrollOffset, _selStart)) - > _width - cursorWidth - 2 * _frameWidth) { + > _width - cursorWidth - 2 * _frameWidth) { _scrollOffset++; if (_scrollOffset >= (int)strlen(_text)) { break; diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp index 72a601a251..a8da89b011 100644 --- a/engines/wintermute/ui/ui_object.cpp +++ b/engines/wintermute/ui/ui_object.cpp @@ -668,7 +668,7 @@ void UIObject::setHeight(int32 height) { bool UIObject::isDisabled() const { return _disable; -} +} bool UIObject::isVisible() const { return _visible; diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h index 56d22a0b18..8d14d8a6a4 100644 --- a/engines/wintermute/ui/ui_object.h +++ b/engines/wintermute/ui/ui_object.h @@ -89,7 +89,7 @@ public: protected: BaseScriptHolder *_listenerParamObject; uint32 _listenerParamDWORD; - BaseScriptHolder *_listenerObject; + BaseScriptHolder *_listenerObject; BaseSprite *_image; BaseFont *_font; bool _sharedFonts; diff --git a/engines/wintermute/ui/ui_window.h b/engines/wintermute/ui/ui_window.h index d8dae8c0d3..a603e0f7b9 100644 --- a/engines/wintermute/ui/ui_window.h +++ b/engines/wintermute/ui/ui_window.h @@ -72,7 +72,7 @@ public: virtual bool scSetProperty(const char *name, ScValue *value) override; virtual bool scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, const char *name) override; virtual const char *scToString(); - + bool getInGame() const; TWindowMode getMode() const; |