diff options
author | Sebastian Geerken <devnull@localhost> | 2014-05-28 01:31:37 +0200 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2014-05-28 01:31:37 +0200 |
commit | 935287d467ef8fecd0fe6e0170d7ec8778e73dad (patch) | |
tree | d644d142c32dba5cd7a6149fb805e5bbb4180828 /dw/widget.hh | |
parent | 4c47a19af4349ba45833ff37406f78bba1fde5ef (diff) |
Cleaned up 'block-level' definition.
Diffstat (limited to 'dw/widget.hh')
-rw-r--r-- | dw/widget.hh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/dw/widget.hh b/dw/widget.hh index e3d9cbe1..6482c63a 100644 --- a/dw/widget.hh +++ b/dw/widget.hh @@ -90,11 +90,6 @@ protected: * The dw::Image widget uses this flag, see dw::Image::setBuffer. */ WAS_ALLOCATED = 1 << 8, - - /** - * \brief Set for block-level widgets (as opposed to inline widgets) - */ - BLOCK_LEVEL = 1 << 9, }; /** @@ -255,12 +250,7 @@ protected: case WAS_ALLOCATED: DBG_OBJ_SET_SYM ("flags.WAS_ALLOCATED", (flags & WAS_ALLOCATED) ? "true" : "false"); - break; - - case BLOCK_LEVEL: - DBG_OBJ_SET_SYM ("flags.BLOCK_LEVEL", - (flags & BLOCK_LEVEL) ? "true" : "false"); - break; + break; } } } @@ -396,7 +386,6 @@ public: inline bool wasAllocated () { return flags & WAS_ALLOCATED; } inline bool usesHints () { return flags & USES_HINTS; } inline bool hasContents () { return flags & HAS_CONTENTS; } - inline bool blockLevel () { return flags & BLOCK_LEVEL; } void setParent (Widget *parent); @@ -413,6 +402,8 @@ public: virtual void setAscent (int ascent); virtual void setDescent (int descent); + virtual bool isBlockLevel (); + bool intersects (Rectangle *area, Rectangle *intersection); /** Area is given in widget coordinates. */ |