summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Melcher <git@matthiasm.com>2019-02-04 23:32:37 +0100
committerMatthias Melcher <git@matthiasm.com>2019-02-04 23:32:37 +0100
commitb663ce85e0f200337626b80ba32cd5b8573a93c6 (patch)
tree2b0094e1aa9c98bc6ce57efab96591522908e8f4
parent0cac8d52e3433a3816399797439017b2ca929451 (diff)
Improved decumentation for '@' symbols in labels (STR #2940).
-rw-r--r--CHANGES.txt1
-rw-r--r--documentation/src/common.dox9
-rw-r--r--documentation/src/symbol-examples.pngbin0 -> 4807 bytes
3 files changed, 10 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e73473fb7..d1908cec5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -102,6 +102,7 @@ Changes in FLTK 1.4.0 Released: ??? ?? 2019
Other Improvements
- (add new items here)
+ - Improved decumentation for '@' symbols in labels (STR #2940).
- Fl_Roller can now be controlled via the mouse wheel (STR #3120).
- Tooltips hide by themselves after 12 seconds (STR #2584).
- Added widget visibility indicator to Fluid (STR #2669).
diff --git a/documentation/src/common.dox b/documentation/src/common.dox
index 9b6360fc5..fd39335f5 100644
--- a/documentation/src/common.dox
+++ b/documentation/src/common.dox
@@ -375,6 +375,15 @@ The @ sign may also be followed by the following optional
Thus, to show a very large arrow pointing downward you would use the
label string "@+92->".
+Symbols and text can can be combined in a label, however the symbol must be at
+the beginning and/or at the end of the text. If the text spans multiple lines,
+the symbol or symbols will scale up to match the height of all the lines.
+
+\image html symbol-examples.png "Figure 3-5: FLTK symbols and text"
+\image latex symbol-examples.png "FLTK symbols and text" width=10cm
+
+<!-- NEED 2in -->
+
\par align()
The \p align() method positions the label. The following
diff --git a/documentation/src/symbol-examples.png b/documentation/src/symbol-examples.png
new file mode 100644
index 000000000..429c1ccdc
--- /dev/null
+++ b/documentation/src/symbol-examples.png
Binary files differ