[Libreoffice-commits] core.git: 2 commits - vcl/source vcl/uiconfig

[Libreoffice Gerrit user]

 vcl/source/gdi/FileDefinitionWidgetDraw.cxx   |    9 ++++++++-
 vcl/uiconfig/theme_definitions/definition.xml |    3 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit e881cb41363874f1644728f2d35dc057e7e484ec
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Jan 25 17:01:12 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 4 12:32:10 2019 +0100

    draw polyline and polygon when drawing rect draw command
    
    Change-Id: Ic00d090e0aa85d451a50be52794606546021be38
    Reviewed-on: https://gerrit.libreoffice.org/68671
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
index 600b736c3c7c..854066694e22 100644
--- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
+++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx
@@ -107,10 +107,17 @@ void munchDrawCommands(std::vector<std::shared_ptr<DrawCommand>> const& rDrawCom
                                         rRectDrawCommand.mnRx, rRectDrawCommand.mnRy);
 
                 basegfx::B2DPolygon aB2DPolygon(aPolygon.getB2DPolygon());
-                rGraphics.SetLineColor(rRectDrawCommand.maStrokeColor);
+                rGraphics.SetLineColor();
                 rGraphics.SetFillColor(rRectDrawCommand.maFillColor);
                 rGraphics.DrawPolyPolygon(basegfx::B2DHomMatrix(),
                                           basegfx::B2DPolyPolygon(aB2DPolygon), 0.0f, nullptr);
+                rGraphics.SetLineColor(rRectDrawCommand.maStrokeColor);
+                rGraphics.SetFillColor();
+                rGraphics.DrawPolyLine(basegfx::B2DHomMatrix(), aB2DPolygon, 0.0f,
+                                       basegfx::B2DVector(rRectDrawCommand.mnStrokeWidth,
+                                                          rRectDrawCommand.mnStrokeWidth),
+                                       basegfx::B2DLineJoin::Round, css::drawing::LineCap_ROUND,
+                                       0.0f, false, nullptr);
             }
             break;
             case DrawCommandType::CIRCLE:
commit 9d86d3538b588d1e4864b9d26c301cd8d6932858
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Fri Jan 25 17:00:06 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Mon Mar 4 12:31:55 2019 +0100

    use line for editbox theme definition
    
    Change-Id: Ie70d1050a58d96443fe5df9c743ba201fca9d25f
    Reviewed-on: https://gerrit.libreoffice.org/68670
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/uiconfig/theme_definitions/definition.xml b/vcl/uiconfig/theme_definitions/definition.xml
index 2bd0212007ee..91c473f290a6 100644
--- a/vcl/uiconfig/theme_definitions/definition.xml
+++ b/vcl/uiconfig/theme_definitions/definition.xml
@@ -81,7 +81,8 @@
     <editbox>
         <part value="Entire">
             <state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
-                <rect stroke="#C7C7C7" fill="#FFFFFF" stroke-width="1" rx="5" ry="5" margin="0"/>
+                <!-- <rect stroke="#C7C7C7" fill="#FFFFFF" stroke-width="2" rx="5" ry="5" margin="0"/> -->
+                <line stroke="#C7C7C7" stroke-width="2" x1="0.0" y1="0.9" x2="1.0" y2="0.9"/>
             </state>
         </part>
     </editbox>