diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-07-10 23:53:06 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-07-10 23:53:06 +0000 |
| commit | 41d2d7dc84877f7187d260c89241d47b7a29a062 (patch) | |
| tree | d9a44107fe1d685719acb26fbe7bb316ca27c8b8 /src/style.h | |
| parent | Update for non-LCMS builds. (diff) | |
| parent | Selector's toolbar: changing the dimensions of the visual bounding box of sel... (diff) | |
| download | inkscape-41d2d7dc84877f7187d260c89241d47b7a29a062.tar.gz inkscape-41d2d7dc84877f7187d260c89241d47b7a29a062.zip | |
Merge from trunk.
(bzr r10439)
Diffstat (limited to 'src/style.h')
| -rw-r--r-- | src/style.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/style.h b/src/style.h index a12db388a..d82a0dd5e 100644 --- a/src/style.h +++ b/src/style.h @@ -206,21 +206,24 @@ enum { SP_BASELINE_SHIFT_PERCENTAGE }; -#define SP_FONT_SIZE ((1 << 24) - 1) - +/* +Not used anymore, originally for SPIFontSize #define SP_F8_16_TO_FLOAT(v) ((gdouble) (v) / (1 << 16)) #define SP_F8_16_FROM_FLOAT(v) ((int) ((v) * ((1 << 16) + 0.9999))) +*/ #define SP_STYLE_FLAG_IFSET (1 << 0) #define SP_STYLE_FLAG_IFDIFF (1 << 1) #define SP_STYLE_FLAG_ALWAYS (1 << 2) -/// Fontsize type internal to SPStyle. +/// Fontsize type internal to SPStyle (also used by libnrtype/Layout-TNG-Input.cpp). struct SPIFontSize { unsigned set : 1; unsigned inherit : 1; unsigned type : 2; - unsigned value : 24; + unsigned unit : 4; + unsigned literal: 4; + float value; float computed; }; |