vcl/headless/svpgdi.cxx | 4 +++-
vcl/inc/headless/svpgdi.hxx | 4 ++--
vcl/unx/gtk3/gtk3gtkframe.cxx | 16 +++++++---------
vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx | 6 ++----
4 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit 2fdbe655bb63dd40fda9b684c5715f21fd5ab639
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Nov 14 16:23:00 2016 +0000
gtk3: scrollbar damage area one pixel too narrow/short
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index f26a8d6..1f861e7 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -1359,7 +1359,9 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr,
bool bXorModeAllowed, cons
if (pDamage)
{
- pDamage->damaged(pDamage->handle, nExtentsLeft, nExtentsTop,
nExtentsRight, nExtentsBottom);
+ pDamage->damaged(pDamage->handle, nExtentsLeft, nExtentsTop,
+ nExtentsRight - nExtentsLeft,
+ nExtentsBottom - nExtentsTop);
}
}
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index 3e7cba9..4373d10 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -67,8 +67,8 @@ typedef struct _cairo_user_data_key cairo_user_data_key_t;
enum PaintMode { OVERPAINT, XOR, INVERT };
typedef void (*damageHandler)(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);
struct VCL_DLLPUBLIC DamageHandler
{
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index febf667..3a1fb9a 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<GtkSalFrame*>(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
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index e9250ed..9377172 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -2010,8 +2010,6 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
clipRegion(cr);
cairo_translate(cr, rControlRegion.Left(), rControlRegion.Top());
- Rectangle aDamageRect(rControlRegion);
-
long nX = 0;
long nY = 0;
long nWidth = rControlRegion.GetWidth();
@@ -2173,8 +2171,8 @@ bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart, co
cairo_destroy(cr); // unref
- if (!aDamageRect.IsEmpty())
- mpFrame->damaged(aDamageRect.Left(), aDamageRect.Top(),
aDamageRect.Right(), aDamageRect.Bottom());
+ if (!rControlRegion.IsEmpty())
+ mpFrame->damaged(rControlRegion.Left(), rControlRegion.Top(),
rControlRegion.GetWidth(), rControlRegion.GetHeight());
return true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
