Skip to content
Permalink
Browse files

Fix layout issues

  • Loading branch information
nyalldawson committed Apr 8, 2021
1 parent 832d5e9 commit 213017a0cb666777051b6d495f68223c747869fd
Showing with 3 additions and 3 deletions.
  1. +1 −1 src/core/pal/feature.cpp
  2. +2 −2 src/core/textrenderer/qgstextrendererutils.h
@@ -1375,7 +1375,7 @@ std::size_t FeaturePart::createCurvedCandidatesAlongLine( std::vector< std::uniq

// placements may need to be reversed if using map orientation and the line has right-to-left direction
bool labeledLineSegmentIsRightToLeft = false;
const QgsTextRendererUtils::LabelLineDirection direction = flags & QgsLabeling::LinePlacementFlag::MapOrientation ? QgsTextRendererUtils::RespectPainterOrientation : QgsTextRendererUtils::FollowLineDirection;
const QgsTextRendererUtils::LabelLineDirection direction = ( flags & QgsLabeling::LinePlacementFlag::MapOrientation ) ? QgsTextRendererUtils::RespectPainterOrientation : QgsTextRendererUtils::FollowLineDirection;

std::unique_ptr< LabelPosition > slp = curvedPlacementAtOffset( mapShape, path_distances, direction, distanceAlongLineToStartCandidate, labeledLineSegmentIsRightToLeft, !singleCandidateOnly );
if ( !slp )
@@ -155,8 +155,8 @@ class CORE_EXPORT QgsTextRendererUtils
* \param pathDistances vector of precalculated distances between vertices in \a x, \a y arrays
* \param offsetAlongLine offset along line at which to start the curved text placement
* \param direction controls placement of text with respect to painter orientation or line direction
* \param maxConcaveAngle maximum angle between chracters for concave text, or -1 if not set
* \param maxConvexAnglemaximum angle between chracters for convex text, or -1 if not set
* \param maxConcaveAngle maximum angle between characters for concave text, or -1 if not set
* \param maxConvexAngle maximum angle between characters for convex text, or -1 if not set
* \param uprightOnly set to TRUE if text should be placed in an upright orientation only, or FALSE to allow upside down text placement
*
* \returns calculated placement properties, or NULLPTR if placement could not be calculated. Caller takes ownership of the returned placement.

0 comments on commit 213017a

Please sign in to comment.