From 362f35430a2edd76885f6cd8f3e4565260d2101a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 13 May 2015 22:23:22 +0300 Subject: Remove duplicate function from graphics. --- src/gui/widgets/browserbox.cpp | 8 +++----- src/gui/widgets/textfield.cpp | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 4862e07a3..fdb528cea 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -473,11 +473,9 @@ void BrowserBox::mouseExited(MouseEvent &event A_UNUSED) void BrowserBox::draw(Graphics *graphics) { BLOCK_START("BrowserBox::draw") - const ClipRect *const cr = graphics->getCurrentClipArea(); - if (!cr) - return; - mYStart = cr->y - cr->yOffset; - const int yEnd = mYStart + cr->height; + const ClipRect &cr = graphics->getTopClip(); + mYStart = cr.y - cr.yOffset; + const int yEnd = mYStart + cr.height; if (mYStart < 0) mYStart = 0; diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 22e5b649f..8f615fc70 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -634,12 +634,10 @@ void TextField::handleCopy() const void TextField::drawCaret(Graphics* graphics, int x) { - const Rect *const clipArea = graphics->getCurrentClipArea(); - if (!clipArea) - return; + const ClipRect &clipArea = graphics->getTopClip(); graphics->setColor(*mCaretColor); - graphics->drawLine(x + mPadding, clipArea->height - mPadding, + graphics->drawLine(x + mPadding, clipArea.height - mPadding, x + mPadding, mPadding); } -- cgit v1.2.3-60-g2f50