summaryrefslogtreecommitdiff
path: root/src/guichan/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-17 16:34:36 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-17 16:34:36 +0300
commitc6c4eef4e49bb4de90845408af9f642a1a4e224b (patch)
tree81d192e85b3c075cb2e52671bea4c3c0499dc3f2 /src/guichan/widgets
parent093e392dd84c920d26bca17d48ac6611393d087c (diff)
downloadmv-c6c4eef4e49bb4de90845408af9f642a1a4e224b.tar.gz
mv-c6c4eef4e49bb4de90845408af9f642a1a4e224b.tar.bz2
mv-c6c4eef4e49bb4de90845408af9f642a1a4e224b.tar.xz
mv-c6c4eef4e49bb4de90845408af9f642a1a4e224b.zip
Improve size calculations.
Diffstat (limited to 'src/guichan/widgets')
-rw-r--r--src/guichan/widgets/tabbedarea.cpp11
-rw-r--r--src/guichan/widgets/textbox.cpp10
2 files changed, 12 insertions, 9 deletions
diff --git a/src/guichan/widgets/tabbedarea.cpp b/src/guichan/widgets/tabbedarea.cpp
index a4179db5e..487549b6a 100644
--- a/src/guichan/widgets/tabbedarea.cpp
+++ b/src/guichan/widgets/tabbedarea.cpp
@@ -88,7 +88,7 @@ namespace gcn
delete mWidgetContainer;
mWidgetContainer = nullptr;
- for (unsigned int i = 0; i < mTabsToDelete.size(); i++)
+ for (size_t i = 0, sz = mTabsToDelete.size(); i < sz; i++)
{
delete mTabsToDelete[i];
mTabsToDelete[i] = nullptr;
@@ -160,7 +160,7 @@ namespace gcn
int TabbedArea::getSelectedTabIndex() const
{
- for (unsigned int i = 0; i < mTabs.size(); i++)
+ for (unsigned int i = 0, sz = mTabs.size(); i < sz; i++)
{
if (mTabs[i].first == mSelectedTab)
return i;
@@ -241,7 +241,7 @@ namespace gcn
{
int maxTabHeight = 0;
- for (unsigned int i = 0; i < mTabs.size(); i++)
+ for (size_t i = 0, sz = mTabs.size(); i < sz; i++)
{
if (mTabs[i].first->getHeight() > maxTabHeight)
maxTabHeight = mTabs[i].first->getHeight();
@@ -258,14 +258,15 @@ namespace gcn
{
int maxTabHeight = 0;
unsigned int i;
- for (i = 0; i < mTabs.size(); i++)
+ const unsigned int sz = mTabs.size();
+ for (i = 0; i < sz; i++)
{
if (mTabs[i].first->getHeight() > maxTabHeight)
maxTabHeight = mTabs[i].first->getHeight();
}
int x = 0;
- for (i = 0; i < mTabs.size(); i++)
+ for (i = 0; i < sz; i++)
{
Tab* tab = mTabs[i].first;
tab->setPosition(x, maxTabHeight - tab->getHeight());
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index 6b03a1cb5..97256eb44 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -130,7 +130,7 @@ namespace gcn
graphics->setColor(getForegroundColor());
graphics->setFont(getFont());
- for (size_t i = 0; i < mTextRows.size(); i++)
+ for (size_t i = 0, sz = mTextRows.size(); i < sz; i++)
{
// Move the text one pixel so we can have a caret before a letter.
graphics->drawText(mTextRows[i], 1,
@@ -170,7 +170,7 @@ namespace gcn
void TextBox::adjustSize()
{
int width = 0;
- for (size_t i = 0; i < mTextRows.size(); ++i)
+ for (size_t i = 0, sz = mTextRows.size(); i < sz; ++i)
{
int w = getFont()->getWidth(mTextRows[i]);
if (width < w)
@@ -183,7 +183,8 @@ namespace gcn
void TextBox::setCaretPosition(unsigned int position)
{
- for (int row = 0; row < static_cast<int>(mTextRows.size()); row ++)
+ for (int row = 0, sz = static_cast<int>(mTextRows.size());
+ row < sz; row ++)
{
if (position <= mTextRows[row].size())
{
@@ -280,7 +281,8 @@ namespace gcn
int i;
std::string text;
- for (i = 0; i < static_cast<int>(mTextRows.size()) - 1; ++ i)
+ const int sz = static_cast<int>(mTextRows.size());
+ for (i = 0; i < sz - 1; ++ i)
text = text + mTextRows[i] + "\n";
text = text + mTextRows[i];