diff options
| author | Narek Mailian | 2013-06-13 12:32:36 +0000 |
|---|---|---|
| committer | Narek Mailian | 2013-08-16 20:54:08 +0200 |
| commit | 887a99e211c25fd16e4cf3b7505ae17678c2f997 (patch) | |
| tree | abb8a48758d30bab824e9794feb193a7d83609cf /gui/object.h | |
| parent | 1d21f5db264b98c53ef1475bdf0f2ffbe01c2e79 (diff) | |
| download | scummvm-rg350-887a99e211c25fd16e4cf3b7505ae17678c2f997.tar.gz scummvm-rg350-887a99e211c25fd16e4cf3b7505ae17678c2f997.tar.bz2 scummvm-rg350-887a99e211c25fd16e4cf3b7505ae17678c2f997.zip | |
GRAPHICS: Added changes and improved code from inisider/scummvm (partial text)
Includes code from https://github.com/inisider/scummvm/ , which has been
squashed and bugfixed
Diffstat (limited to 'gui/object.h')
| -rw-r--r-- | gui/object.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gui/object.h b/gui/object.h index bce3cd7846..dac3341b5a 100644 --- a/gui/object.h +++ b/gui/object.h @@ -24,6 +24,7 @@ #include "common/scummsys.h" #include "common/str.h" +#include "common/rect.h" namespace GUI { @@ -59,6 +60,8 @@ class Widget; class GuiObject : public CommandReceiver { friend class Widget; protected: + Common::Rect _textDrawableArea; + int16 _x, _y; uint16 _w, _h; const Common::String _name; @@ -66,10 +69,12 @@ protected: Widget *_firstWidget; public: - GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0) { } + GuiObject(int x, int y, int w, int h) : _x(x), _y(y), _w(w), _h(h), _firstWidget(0), _textDrawableArea(Common::Rect(0, 0, 0, 0)) { } GuiObject(const Common::String &name); ~GuiObject(); + virtual void setTextDrawableArea(const Common::Rect &r) { _textDrawableArea = r; } + virtual int16 getAbsX() const { return _x; } virtual int16 getAbsY() const { return _y; } virtual int16 getChildX() const { return getAbsX(); } |