← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-09-17 10:35:51 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130917103551-az7p3nz9jgxwqjfn
Tags: 1.3.9.15-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/widgets/tab.cpp
23
23
#include "gui/widgets/tab.h"
24
24
 
25
25
#include "client.h"
26
 
#include "configuration.h"
27
26
#include "graphicsvertexes.h"
28
27
 
29
28
#include "gui/widgets/label.h"
30
29
#include "gui/widgets/tabbedarea.h"
31
30
 
32
 
#include "utils/dtor.h"
33
 
 
34
31
#include "debug.h"
35
32
 
36
33
int Tab::mInstances = 0;
221
218
    if (skin)
222
219
    {
223
220
        // draw tab
224
 
        if (openGLMode != 2)
 
221
        if (openGLMode != RENDER_SAFE_OPENGL)
225
222
        {
226
223
            const ImageRect &rect = skin->getBorder();
227
224
            if (mRedraw || mode != mMode || g->getRedraw())
231
228
                mVertexes->clear();
232
229
                g->calcWindow(mVertexes, 0, 0,
233
230
                    mDimension.width, mDimension.height, rect);
 
231
 
 
232
                if (mImage)
 
233
                {
 
234
                    const Skin *const skin1 = tabImg[TAB_STANDARD];
 
235
                    if (skin1)
 
236
                    {
 
237
                        const int padding = skin1->getPadding();
 
238
                        g->calcTile(mVertexes, mImage, padding, padding);
 
239
                    }
 
240
                }
234
241
            }
235
242
 
236
243
            g->drawTile(mVertexes);
239
246
        {
240
247
            g->drawImageRect(0, 0,
241
248
                mDimension.width, mDimension.height, skin->getBorder());
242
 
        }
243
 
    }
244
 
 
245
 
    if (mImage)
246
 
    {
247
 
        const Skin *const skin1 = tabImg[TAB_STANDARD];
248
 
        if (skin1)
249
 
        {
250
 
            const int padding = skin1->getPadding();
251
 
            g->drawImage(mImage, padding, padding);
 
249
            if (mImage)
 
250
            {
 
251
                const Skin *const skin1 = tabImg[TAB_STANDARD];
 
252
                if (skin1)
 
253
                {
 
254
                    const int padding = skin1->getPadding();
 
255
                    g->drawImage(mImage, padding, padding);
 
256
                }
 
257
            }
252
258
        }
253
259
    }
254
260