|
 |
d03d21a |
From 1835e0c82fca788aef823d91bda4fedef26cd712 Mon Sep 17 00:00:00 2001
|
|
|
d03d21a |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
d03d21a |
Date: Wed, 1 Aug 2018 10:10:16 +0100
|
|
|
d03d21a |
Subject: [PATCH] Resolves: rhbz#1610692 rectangles ctor takes topleft,
|
|
|
d03d21a |
bottomright points
|
|
|
d03d21a |
|
|
|
d03d21a |
so pass arguments in the topleft, bottomright order to avoid eventual...
|
|
|
d03d21a |
|
|
|
d03d21a |
Gtk-CRITICAL **: 09:43:33.896: gtk_widget_queue_draw_area: assertion 'height >= 0' failed
|
|
|
d03d21a |
|
|
|
d03d21a |
Change-Id: I2396f49470274331c49275a5e6d707f59277be4a
|
|
|
d03d21a |
Reviewed-on: https://gerrit.libreoffice.org/58392
|
|
|
d03d21a |
Tested-by: Jenkins
|
|
|
d03d21a |
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
|
|
|
d03d21a |
---
|
|
|
d03d21a |
vcl/source/control/fixed.cxx | 8 ++++----
|
|
|
d03d21a |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
d03d21a |
|
|
|
d03d21a |
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
|
|
|
d03d21a |
index dac10a896278..eeba87afab05 100644
|
|
|
d03d21a |
--- a/vcl/source/control/fixed.cxx
|
|
|
d03d21a |
+++ b/vcl/source/control/fixed.cxx
|
|
|
d03d21a |
@@ -531,11 +531,11 @@ void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext)
|
|
|
d03d21a |
rRenderContext.DrawText(aTextPt, aText, 0, aText.getLength());
|
|
|
d03d21a |
rRenderContext.Pop();
|
|
|
d03d21a |
if (aOutSize.Height() - aStartPt.Y() > FIXEDLINE_TEXT_BORDER)
|
|
|
d03d21a |
- aDecoView.DrawSeparator(Point(aStartPt.X(), aOutSize.Height() - 1),
|
|
|
d03d21a |
- Point(aStartPt.X(), aStartPt.Y() + FIXEDLINE_TEXT_BORDER));
|
|
|
d03d21a |
+ aDecoView.DrawSeparator(Point(aStartPt.X(), aStartPt.Y() + FIXEDLINE_TEXT_BORDER),
|
|
|
d03d21a |
+ Point(aStartPt.X(), aOutSize.Height() - 1));
|
|
|
d03d21a |
if (aStartPt.Y() - nWidth - FIXEDLINE_TEXT_BORDER > 0)
|
|
|
d03d21a |
- aDecoView.DrawSeparator(Point(aStartPt.X(), aStartPt.Y() - nWidth - FIXEDLINE_TEXT_BORDER),
|
|
|
d03d21a |
- Point(aStartPt.X(), 0));
|
|
|
d03d21a |
+ aDecoView.DrawSeparator(Point(aStartPt.X(), 0),
|
|
|
d03d21a |
+ Point(aStartPt.X(), aStartPt.Y() - nWidth - FIXEDLINE_TEXT_BORDER));
|
|
|
d03d21a |
}
|
|
|
d03d21a |
else
|
|
|
d03d21a |
{
|
|
|
d03d21a |
--
|
|
|
d03d21a |
2.17.1
|
|
|
d03d21a |
|