~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/gui/widgets/layout.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-07-11 10:09:41 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20130711100941-f0rwuvcwgl8ulqo8
Tags: 1.3.7.7.1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
236
236
                        LayoutCell const &cell, const int *const sizes,
237
237
                        const int sizeCount) const
238
238
{
 
239
    if (dim < 0 || dim >= 2)
 
240
        return;
239
241
    int size_max = sizes[0];
240
242
    int cnt = cell.mExtent[dim];
241
243
    if (sizeCount && cell.mExtent[dim] > sizeCount)
266
268
 
267
269
std::vector<int> LayoutArray::getSizes(const int dim, int upp) const
268
270
{
 
271
    if (dim < 0 || dim >= 2)
 
272
        return mSizes[1];
 
273
 
269
274
    const int gridW = static_cast<int>(mSizes[0].size());
270
275
    const int gridH = static_cast<int>(mSizes[1].size());
271
276
    std::vector<int> sizes = mSizes[dim];