summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-03-04 19:23:03 +0300
committerAndrei Karas <akaras@inbox.ru>2016-03-04 19:23:03 +0300
commit9706e377c799d4b2c0a9f88c8ba6768bf2ea858c (patch)
tree37bc6dc1cfdac6d392409bc520ac6288a7810989 /src/gui/widgets
parent367c92d1ac584eb7ad5812f717aea27456f44e5f (diff)
downloadmv-9706e377c799d4b2c0a9f88c8ba6768bf2ea858c.tar.gz
mv-9706e377c799d4b2c0a9f88c8ba6768bf2ea858c.tar.bz2
mv-9706e377c799d4b2c0a9f88c8ba6768bf2ea858c.tar.xz
mv-9706e377c799d4b2c0a9f88c8ba6768bf2ea858c.zip
Remove isVisible getter from widget.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/basiccontainer.cpp4
-rw-r--r--src/gui/widgets/tabbedarea.cpp2
-rw-r--r--src/gui/widgets/widget.cpp2
-rw-r--r--src/gui/widgets/widget.h13
4 files changed, 9 insertions, 12 deletions
diff --git a/src/gui/widgets/basiccontainer.cpp b/src/gui/widgets/basiccontainer.cpp
index 26434d7e9..8a4d3162a 100644
--- a/src/gui/widgets/basiccontainer.cpp
+++ b/src/gui/widgets/basiccontainer.cpp
@@ -305,7 +305,7 @@ void BasicContainer::drawChildren(Graphics *const restrict graphics) restrict2
FOR_EACH (WidgetListConstIterator, iter, mWidgets)
{
Widget *restrict const widget = *iter;
- if (widget->isVisibleLocal())
+ if (widget->mVisible == Visible_true)
{
// If the widget has a frame,
// draw it before drawing the widget
@@ -346,7 +346,7 @@ void BasicContainer::safeDrawChildren(Graphics *const restrict graphics)
FOR_EACH (WidgetListConstIterator, iter, mWidgets)
{
Widget *restrict const widget = *iter;
- if (widget->isVisibleLocal())
+ if (widget->mVisible == Visible_true)
{
// If the widget has a frame,
// draw it before drawing the widget
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 2d1acc5fc..2a1f59bbf 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -580,7 +580,7 @@ void TabbedArea::adjustTabPositions()
maxTabHeight = tab->getHeight();
}
- int x = (mEnableScrollButtons && mArrowButton[0]->isVisibleLocal())
+ int x = (mEnableScrollButtons && mArrowButton[0]->mVisible == Visible_true)
? mArrowButton[0]->getWidth() : 0;
for (size_t i = mTabScrollIndex; i < sz; ++i)
{
diff --git a/src/gui/widgets/widget.cpp b/src/gui/widgets/widget.cpp
index 1ddd2c120..f2f112c61 100644
--- a/src/gui/widgets/widget.cpp
+++ b/src/gui/widgets/widget.cpp
@@ -81,6 +81,7 @@ std::set<Widget*> Widget::mWidgetsSet;
Widget::Widget(const Widget2 *const widget) :
Widget2(widget),
+ mVisible(Visible_true),
mMouseListeners(),
mKeyListeners(),
mActionListeners(),
@@ -99,7 +100,6 @@ Widget::Widget(const Widget2 *const widget) :
mCurrentFont(nullptr),
mFrameSize(0),
mFocusable(false),
- mVisible(Visible_true),
mTabIn(true),
mTabOut(true),
mEnabled(true),
diff --git a/src/gui/widgets/widget.h b/src/gui/widgets/widget.h
index b94f81251..ed11955e5 100644
--- a/src/gui/widgets/widget.h
+++ b/src/gui/widgets/widget.h
@@ -401,9 +401,6 @@ class Widget notfinal : public Widget2
{ return mVisible == Visible_true &&
(!mParent || mParent->isVisible()); }
- bool isVisibleLocal() const noexcept A_WARN_UNUSED
- { return mVisible == Visible_true; }
-
/**
* Sets the base color of the widget.
*
@@ -1032,6 +1029,11 @@ class Widget notfinal : public Widget2
virtual void postInit()
{ }
+ /**
+ * True if the widget visible, false otherwise.
+ */
+ Visible mVisible;
+
protected:
/**
* Distributes an action event to all action listeners
@@ -1221,11 +1223,6 @@ class Widget notfinal : public Widget2
bool mFocusable;
/**
- * True if the widget visible, false otherwise.
- */
- Visible mVisible;
-
- /**
* True if the widget has tab in enabled, false otherwise.
*/
bool mTabIn;