Add Line Height unit options (#8138)

qgis · Jul 11, 2023 · 9ad26cd · 9ad26cd
2 parents 5bb9c1d + 5518aff
commit 9ad26cd
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 2 deletions.
diff --git a/docs/user_manual/style_library/img/label_background.png b/docs/user_manual/style_library/img/label_background.png
diff --git a/docs/user_manual/style_library/img/label_buffer.png b/docs/user_manual/style_library/img/label_buffer.png
diff --git a/docs/user_manual/style_library/img/label_formatting.png b/docs/user_manual/style_library/img/label_formatting.png
diff --git a/docs/user_manual/style_library/img/label_mask.png b/docs/user_manual/style_library/img/label_mask.png
diff --git a/docs/user_manual/style_library/img/label_shadow.png b/docs/user_manual/style_library/img/label_shadow.png
diff --git a/docs/user_manual/style_library/img/label_text.png b/docs/user_manual/style_library/img/label_text.png
diff --git a/docs/user_manual/style_library/img/stylemanager_labelsettings.png b/docs/user_manual/style_library/img/stylemanager_labelsettings.png
diff --git a/docs/user_manual/style_library/img/stylemanager_textformat.png b/docs/user_manual/style_library/img/stylemanager_textformat.png
diff --git a/docs/user_manual/style_library/label_settings.rst b/docs/user_manual/style_library/label_settings.rst
@@ -235,7 +235,11 @@ In the |labelformatting| :guilabel:`Formatting` tab, you can:
   * Set an ideal line size for auto-wrapping using the :guilabel:`Wrap lines to`
     option. The size can represent either the :guilabel:`Maximum line length`
     or the :guilabel:`Minimum line length`.
-  * Decide the :guilabel:`Line Height`
+  * Decide the :guilabel:`Line Height`: values can be set to be in
+    :guilabel:`Millimeters`, :guilabel:`Points`, :guilabel:`Pixels`, 
+    :guilabel:`Percentage`, or :guilabel:`Inches`.
+    When line height is set to percentage it is the percentage of the 
+    default text line spacing of that font family. Typically 1.2 to 1.5 times the text size.  
   * Format the :guilabel:`Alignment`: typical values available are
     :guilabel:`Left`, :guilabel:`Right`, :guilabel:`Justify` and :guilabel:`Center`.
 
@@ -425,7 +429,8 @@ labels with similar colors, and you want to make the labels visible.
 .. figure:: img/label_mask.png
    :align: center
 
-   Labels settings - Mask tab
+   Labels settings - Mask tab (with the text sample showing a green background 
+   representing another layer being excluded)
 
 To create masking effects on labels: