diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-04-07 21:01:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-04-07 21:38:22 +0300 |
| commit | a9732d3ad6115ad7d590e819631dfbd764d13d3e (patch) | |
| tree | c62984bf527305f275a521e227d785df769c1351 /src/gui/widgets | |
| parent | b43854b65e0c8bdbc37db2a0b6e2e86ebf11e7f7 (diff) | |
| download | mv-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.gz mv-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.bz2 mv-a9732d3ad6115ad7d590e819631dfbd764d13d3e.tar.xz mv-a9732d3ad6115ad7d590e819631dfbd764d13d3e.zip | |
remove useless checks.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/guitable.cpp | 13 | ||||
| -rw-r--r-- | src/gui/widgets/tabbedarea.cpp | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 16604d760..ec23fda38 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -588,16 +588,13 @@ void GuiTable::_setFocusHandler(gcn::FocusHandler* focusHandler) gcn::Widget::_setFocusHandler(focusHandler); - if (mModel) + for (int r = 0; r < mModel->getRows(); ++r) { - for (int r = 0; r < mModel->getRows(); ++r) + for (int c = 0; c < mModel->getColumns(); ++c) { - for (int c = 0; c < mModel->getColumns(); ++c) - { - gcn::Widget *const w = mModel->getElementAt(r, c); - if (w) - w->_setFocusHandler(focusHandler); - } + gcn::Widget *const w = mModel->getElementAt(r, c); + if (w) + w->_setFocusHandler(focusHandler); } } } diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 82f7b82e4..a805aa5cc 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -379,7 +379,7 @@ void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED) const gcn::Rectangle rect = w->getDimension(); if (rect.height != 0 && rect.height > height + 2) { - if (scr && scr->getVerticalScrollAmount() + if (scr->getVerticalScrollAmount() >= scr->getVerticalMaxScroll() - 2 && scr->getVerticalScrollAmount() <= scr->getVerticalMaxScroll() + 2) |