From b663ce85e0f200337626b80ba32cd5b8573a93c6 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 4 Feb 2019 23:32:37 +0100 Subject: [PATCH] Improved decumentation for '@' symbols in labels (STR #2940). --- CHANGES.txt | 1 + documentation/src/common.dox | 9 +++++++++ documentation/src/symbol-examples.png | Bin 0 -> 4807 bytes 3 files changed, 10 insertions(+) create mode 100644 documentation/src/symbol-examples.png 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 + + + \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 0000000000000000000000000000000000000000..429c1ccdcd74847de0f72bc826698f3925d13451 GIT binary patch literal 4807 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 RC;v#IP*c`YDpkA({0|*A=YRkJ literal 0 HcmV?d00001