From a9732d3ad6115ad7d590e819631dfbd764d13d3e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Apr 2013 21:01:35 +0300 Subject: remove useless checks. --- src/gui/widgets/guitable.cpp | 13 +++++-------- src/gui/widgets/tabbedarea.cpp | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/gui/widgets') 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) -- cgit v1.2.3-70-g09d2