From 2fdbe655bb63dd40fda9b684c5715f21fd5ab639 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 Nov 2016 16:23:00 +0000 Subject: gtk3: scrollbar damage area one pixel too narrow/short MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit under default Ambience theme Ubuntu 16.04 tools rectangle strikes again, rejig to be left/top + width/height rather than left/top + right/bottom Change-Id: Id5274f068863cd5219a89142b392c9ca53a1694d Reviewed-on: https://gerrit.libreoffice.org/30850 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/unx/gtk3/gtk3gtkframe.cxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'vcl/unx/gtk3/gtk3gtkframe.cxx') diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index febf667bf418..3a1fb9a21fc1 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -969,12 +969,11 @@ GtkWidget *GtkSalFrame::getMouseEventWidget() const } static void damaged(void *handle, - sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop, - sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) + sal_Int32 nExtentsX, sal_Int32 nExtentsY, + sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) { GtkSalFrame* pThis = static_cast(handle); - pThis->damaged(nExtentsLeft, nExtentsTop, - nExtentsRight, nExtentsBottom); + pThis->damaged(nExtentsX, nExtentsY, nExtentsWidth, nExtentsHeight); } void GtkSalFrame::InitCommon() @@ -2826,8 +2825,8 @@ cairo_t* GtkSalFrame::getCairoContext() const return cr; } -void GtkSalFrame::damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop, - sal_Int32 nExtentsRight, sal_Int32 nExtentsBottom) const +void GtkSalFrame::damaged(sal_Int32 nExtentsX, sal_Int32 nExtentsY, + sal_Int32 nExtentsWidth, sal_Int32 nExtentsHeight) const { if (dumpframes) { @@ -2839,9 +2838,8 @@ void GtkSalFrame::damaged(sal_Int32 nExtentsLeft, sal_Int32 nExtentsTop, } gtk_widget_queue_draw_area(GTK_WIDGET(m_pFixedContainer), - nExtentsLeft, nExtentsTop, - nExtentsRight - nExtentsLeft, - nExtentsBottom - nExtentsTop); + nExtentsX, nExtentsY, + nExtentsWidth, nExtentsHeight); } // blit our backing cairo surface to the target cairo context -- cgit