diff options
| author | Marc Jeanmougin <marc.jeanmougin@telecom-paristech.fr> | 2018-04-29 22:12:49 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc.jeanmougin@telecom-paristech.fr> | 2018-04-29 22:12:49 +0000 |
| commit | a3bac1415bbee232d532402a2681f8c639560970 (patch) | |
| tree | 428db932d5ccec68ddef3592040fbd494ffb0184 /src/ui/widget/font-variations.cpp | |
| parent | Fix include order with clang-tidy check llvm-include-order (diff) | |
| parent | Bug fixes for variable fonts, especially to support the Decovar font. (diff) | |
| download | inkscape-a3bac1415bbee232d532402a2681f8c639560970.tar.gz inkscape-a3bac1415bbee232d532402a2681f8c639560970.zip | |
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/ui/widget/font-variations.cpp')
| -rw-r--r-- | src/ui/widget/font-variations.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp index f339fe033..7c7aff018 100644 --- a/src/ui/widget/font-variations.cpp +++ b/src/ui/widget/font-variations.cpp @@ -33,11 +33,18 @@ namespace Widget { FontVariationAxis::FontVariationAxis (Glib::ustring name, OTVarAxis& axis) : name (name) { - // std::cout << "FontVariationAxis::FontVariationAxis:: name: " << name << std::endl; + + // std::cout << "FontVariationAxis::FontVariationAxis:: " + // << " name: " << name + // << " min: " << axis.minimum + // << " max: " << axis.maximum + // << " val: " << axis.set_val << std::endl; + label = Gtk::manage( new Gtk::Label( name ) ); add( *label ); - precision = 2 - int( log10(axis.maximum - axis.minimum)); + precision = 2 - int( log10(axis.maximum - axis.minimum)); + if (precision < 0) precision = 0; scale = Gtk::manage( new Gtk::Scale() ); scale->set_range (axis.minimum, axis.maximum); @@ -129,7 +136,7 @@ FontVariations::get_pango_string() { pango_string += "@"; for (auto axis: axes) { - if (axis->get_value() == 0) continue; // TEMP ************* + if (axis->get_value() == 0) continue; // TEMP: Should check against default value. Glib::ustring name = axis->get_name(); // Translate the "named" axes. (Additional names in 'stat' table, may need to handle them.) |