diff --git a/README.md b/README.md index 44c24516..9264fd82 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ This README is being written.
## Announcements +* **21 October 2016** + * `uiDrawTextWeightUltraBold` is now spelled correctly. Thanks to @krakjoe. + * **18 June 2016** * Help decide [the design of tables and trees in libui](https://github.com/andlabs/libui/issues/159); the implementation starts within the next few days, if not tomorrow! diff --git a/darwin/drawtext.m b/darwin/drawtext.m index 810a3a43..07038616 100644 --- a/darwin/drawtext.m +++ b/darwin/drawtext.m @@ -164,7 +164,7 @@ static const CGFloat ctWeights[] = { [uiDrawTextWeightSemiBold] = ourNSFontWeightSemibold, [uiDrawTextWeightBold] = ourNSFontWeightBold, // for this one let's go between Bold and Heavy - [uiDrawTextWeightUtraBold] = ourNSFontWeightBold + ((ourNSFontWeightHeavy - ourNSFontWeightBold) / 2), + [uiDrawTextWeightUltraBold] = ourNSFontWeightBold + ((ourNSFontWeightHeavy - ourNSFontWeightBold) / 2), [uiDrawTextWeightHeavy] = ourNSFontWeightHeavy, [uiDrawTextWeightUltraHeavy] = ourNSFontWeightBlack, }; diff --git a/test/page9.c b/test/page9.c index 5591c054..65b2d3a1 100644 --- a/test/page9.c +++ b/test/page9.c @@ -230,7 +230,7 @@ uiBox *makePage9(void) uiComboboxAppend(textWeight, "Medium"); uiComboboxAppend(textWeight, "Semi Bold"); uiComboboxAppend(textWeight, "Bold"); - uiComboboxAppend(textWeight, "Utra Bold"); + uiComboboxAppend(textWeight, "Ultra Bold"); uiComboboxAppend(textWeight, "Heavy"); uiComboboxAppend(textWeight, "Ultra Heavy"); uiComboboxSetSelected(textWeight, uiDrawTextWeightNormal); diff --git a/ui.h b/ui.h index 70c2f121..cedfb60e 100644 --- a/ui.h +++ b/ui.h @@ -481,7 +481,7 @@ _UI_ENUM(uiDrawTextWeight) { uiDrawTextWeightMedium, uiDrawTextWeightSemiBold, uiDrawTextWeightBold, - uiDrawTextWeightUtraBold, + uiDrawTextWeightUltraBold, uiDrawTextWeightHeavy, uiDrawTextWeightUltraHeavy, }; diff --git a/unix/drawtext.c b/unix/drawtext.c index d31c264c..7078e1ac 100644 --- a/unix/drawtext.c +++ b/unix/drawtext.c @@ -62,7 +62,7 @@ static const PangoWeight pangoWeights[] = { [uiDrawTextWeightMedium] = PANGO_WEIGHT_MEDIUM, [uiDrawTextWeightSemiBold] = PANGO_WEIGHT_SEMIBOLD, [uiDrawTextWeightBold] = PANGO_WEIGHT_BOLD, - [uiDrawTextWeightUtraBold] = PANGO_WEIGHT_ULTRABOLD, + [uiDrawTextWeightUltraBold] = PANGO_WEIGHT_ULTRABOLD, [uiDrawTextWeightHeavy] = PANGO_WEIGHT_HEAVY, [uiDrawTextWeightUltraHeavy] = PANGO_WEIGHT_ULTRAHEAVY, }; diff --git a/windows/drawtext.cpp b/windows/drawtext.cpp index 023fcdd9..05a24f67 100644 --- a/windows/drawtext.cpp +++ b/windows/drawtext.cpp @@ -94,7 +94,7 @@ static const struct { { false, uiDrawTextWeightMedium, DWRITE_FONT_WEIGHT_MEDIUM }, { false, uiDrawTextWeightSemiBold, DWRITE_FONT_WEIGHT_SEMI_BOLD }, { false, uiDrawTextWeightBold, DWRITE_FONT_WEIGHT_BOLD }, - { false, uiDrawTextWeightUtraBold, DWRITE_FONT_WEIGHT_ULTRA_BOLD }, + { false, uiDrawTextWeightUltraBold, DWRITE_FONT_WEIGHT_ULTRA_BOLD }, { false, uiDrawTextWeightHeavy, DWRITE_FONT_WEIGHT_HEAVY }, { true, uiDrawTextWeightUltraHeavy, DWRITE_FONT_WEIGHT_ULTRA_BLACK, }, };