summaryrefslogtreecommitdiff
path: root/src/gui/widgets/layout.cpp
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/gui/widgets/layout.cpp
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/gui/widgets/layout.cpp')
-rw-r--r--src/gui/widgets/layout.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index f7941889..c40a3b2c 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -37,13 +37,15 @@ LayoutCell &ContainerPlacer::operator()
LayoutCell::~LayoutCell()
{
- if (mType == ARRAY) delete mArray;
+ if (mType == ARRAY)
+ delete mArray;
}
LayoutArray &LayoutCell::getArray()
{
assert(mType != WIDGET);
- if (mType == ARRAY) return *mArray;
+ if (mType == ARRAY)
+ return *mArray;
mArray = new LayoutArray;
mType = ARRAY;
mExtent[0] = 1;
@@ -114,7 +116,8 @@ void LayoutArray::resizeGrid(int w, int h)
{
bool extW = w && w > (int)mSizes[0].size(),
extH = h && h > (int)mSizes[1].size();
- if (!extW && !extH) return;
+ if (!extW && !extH)
+ return;
if (extH)
{
@@ -177,8 +180,10 @@ LayoutCell &LayoutArray::place(gcn::Widget *widget, int x, int y, int w, int h)
cell.mAlign[1] = LayoutCell::FILL;
short &cs = mSizes[0][x];
short &rs = mSizes[1][y];
- if (cs == Layout::AUTO_DEF && w == 1) cs = 0;
- if (rs == Layout::AUTO_DEF && h == 1) rs = 0;
+ if (cs == Layout::AUTO_DEF && w == 1)
+ cs = 0;
+ if (rs == Layout::AUTO_DEF && h == 1)
+ rs = 0;
return cell;
}
@@ -218,7 +223,8 @@ std::vector< short > LayoutArray::getSizes(int dim, int upp) const
for (int gridX = 0; gridX < gridW; ++gridX)
{
LayoutCell const *cell = mCells[gridY][gridX];
- if (!cell || cell->mType == LayoutCell::NONE) continue;
+ if (!cell || cell->mType == LayoutCell::NONE)
+ continue;
if (cell->mExtent[dim] == 1)
{
@@ -249,7 +255,8 @@ std::vector< short > LayoutArray::getSizes(int dim, int upp) const
}
upp = upp + mSpacing;
- if (nbFill == 0) return sizes;
+ if (nbFill == 0)
+ return sizes;
for (int i = 0; i < nb; ++i)
{