diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/popup.cpp | 29 | ||||
| -rw-r--r-- | src/gui/widgets/tab.cpp | 35 |
2 files changed, 35 insertions, 29 deletions
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 1372c89e2..438b5db29 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -101,23 +101,26 @@ void Popup::draw(gcn::Graphics *graphics) BLOCK_START("Popup::draw") Graphics *const g = static_cast<Graphics*>(graphics); - if (openGLMode != 2) + if (mSkin) { - if (mRedraw) + if (openGLMode != 2) + { + if (mRedraw) + { + mRedraw = false; + mVertexes->clear(); + g->calcWindow(mVertexes, 0, 0, + mDimension.width, mDimension.height, + mSkin->getBorder()); + } + + g->drawTile(mVertexes); + } + else { - mRedraw = false; - mVertexes->clear(); - g->calcWindow(mVertexes, 0, 0, - mDimension.width, mDimension.height, + g->drawImageRect(0, 0, mDimension.width, mDimension.height, mSkin->getBorder()); } - - g->drawTile(mVertexes); - } - else - { - g->drawImageRect(0, 0, mDimension.width, mDimension.height, - mSkin->getBorder()); } drawChildren(graphics); diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index 99a69897d..ac91442fb 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -218,25 +218,28 @@ void Tab::draw(gcn::Graphics *graphics) Graphics *const g = static_cast<Graphics*>(graphics); - // draw tab - if (openGLMode != 2) + if (skin) { - const ImageRect &rect = skin->getBorder(); - if (mRedraw || mode != mMode || g->getRedraw()) + // draw tab + if (openGLMode != 2) { - mMode = mode; - mRedraw = false; - mVertexes->clear(); - g->calcWindow(mVertexes, 0, 0, - mDimension.width, mDimension.height, rect); - } + const ImageRect &rect = skin->getBorder(); + if (mRedraw || mode != mMode || g->getRedraw()) + { + mMode = mode; + mRedraw = false; + mVertexes->clear(); + g->calcWindow(mVertexes, 0, 0, + mDimension.width, mDimension.height, rect); + } - g->drawTile(mVertexes); - } - else - { - g->drawImageRect(0, 0, - mDimension.width, mDimension.height, skin->getBorder()); + g->drawTile(mVertexes); + } + else + { + g->drawImageRect(0, 0, + mDimension.width, mDimension.height, skin->getBorder()); + } } if (mImage) |