From 313392119522c21a6ecd14403d6f92c948149df7 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 25 Oct 2018 10:06:05 +0200 Subject: Reorganize FrameBorderPrimitive creation (II) Step5: Move the view-dependent decomposition from BorderLinePrimitive2D to SdrFrameBorderPrimitive2D. It is now possible to use discrete sizes before the line and edge matching is done what will look much better. When it was done at BorderLinePrimitive2D and the matching was already done, that match was 'displaced' with the adapted forced scale to discrete units. The space and size used when zooming out for a single discrete unit (pixel) can heavily vary - it just covers a much larger logical area than the 'real' line/poly would do. All this needs to be handled (also for bound ranges) and can only be in a good way using primitives. Adapted to no longer do view-dependent changes in BorderLinePrimitive2D. Adapted to do these now at SdrFrameBorderPrimitive2D. Currently used to force the existing border partial lines (up to three) to not get taller than one logical unit. Adapted to no longer switch off AntiAliased rendering in VclPixelProcessor2D for processBorderLinePrimitive2D, this is problematic with various renderers on various systems (e.g. vcl still falls back to render multiple one-pixel-lines when taller than 3.5 pixels which looks horrible combined with other parts like filled polygons) All this needs fine balancing on - all systems - all renderers - all apps (which all have their own table implementation) - all render targets (pixel/PDF/print/slideshow/...) Done as thorough as possible, but may need additional finetuning. May also be a motivation to move away from vcl and implement these urgetly needed system-dependent primitive renderers... Adapted UnitTest testDoublePixelProcessing with the needed comments. Change-Id: Ie88bb76c2474b6ab3764d45a9cd1669264492acd Reviewed-on: https://gerrit.libreoffice.org/62344 Tested-by: Jenkins Reviewed-by: Armin Le Grand --- .../primitive2d/borderlineprimitive2d.hxx | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'include/drawinglayer') diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index cb57e40fbe8a..a3f41985061e 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -38,7 +38,9 @@ namespace drawinglayer /** BorderLine class Helper class holding the style definition for a single part of a full BorderLine definition. Line extends are for start/end and for Left/Right, seen in vector direction. If - Left != Right that means the line has a diagonal start/end + Left != Right that means the line has a diagonal start/end. + Think about it similar to a trapezoid, but not aligned to X-Axis and using the + perpendicular vector to the given one in a right-handed coordinate system. */ class DRAWINGLAYER_DLLPUBLIC BorderLine { @@ -76,9 +78,6 @@ namespace drawinglayer double getEndRight() const { return mfEndRight; } bool isGap() const { return mbIsGap; } - /// helper to get adapted width (maximum) - double getAdaptedWidth(double fMinWidth) const; - /// compare operator bool operator==(const BorderLine& rBorderLine) const; }; @@ -111,18 +110,10 @@ namespace drawinglayer /// common style definitions const drawinglayer::attribute::StrokeAttribute maStrokeAttribute; - // for view dependent decomposition in the case with existing gaps, - // remember the smallest allowed concrete gap distance, see get2DDecomposition - // implementation - double mfSmallestAllowedDiscreteGapDistance; - /// create local decomposition virtual void create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& rViewInformation) const override; - /// helper to find smallest defined gap in maBorderLines - bool getSmallestGap(double& rfSmallestGap) const; - - /// helper to get the full width taking mfSmallestAllowedDiscreteGapDistance into account + /// helper to get the full width from maBorderLines double getFullWidth() const; public: @@ -145,9 +136,6 @@ namespace drawinglayer /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; - /// Override standard getDecomposition to be view-dependent here - virtual void get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; - /// provide unique ID DeclPrimitive2DIDBlock() }; -- cgit