diff --git a/share/ui/font-list.glade b/share/ui/font-list.glade index 20209902a9c7f1b681a0f1ca5de72cd64f61e0fa..ec38dcf4ffe1f90a857ff6c51fd64e4c23e7798f 100644 --- a/share/ui/font-list.glade +++ b/share/ui/font-list.glade @@ -136,6 +136,7 @@ + FontList True True 3 @@ -164,6 +165,7 @@ @@ -560,6 +562,7 @@ diff --git a/share/ui/style.css b/share/ui/style.css index 15e7972653b90cd4493d0be7e96c596468a31d10..724b86c29893a1738499ce92f8acd1b13844e4ea 100644 --- a/share/ui/style.css +++ b/share/ui/style.css @@ -1786,3 +1786,7 @@ padding:0 1px; background: transparent; border: none; } + +#FontList .font-list { + min-height: 8em; +} diff --git a/src/ui/widget/font-list.cpp b/src/ui/widget/font-list.cpp index 956a606c8eac653a5fccc97c28fda53ac01be5a6..ad45df8d120b73d78af34c00952230f7e0382bc1 100644 --- a/src/ui/widget/font-list.cpp +++ b/src/ui/widget/font-list.cpp @@ -247,9 +247,6 @@ FontList::FontList(Glib::ustring preferences_path) : _font_list_store = Gtk::ListStore::create(g_column_model); get_widget(_builder, "variants").append(_font_variations); - // takes up available space in the dialog instead of collapsing. - _font_variations.set_vexpand(true); - _font_variations.set_valign(Gtk::Align::FILL); _font_variations.get_size_group(0)->add_widget(get_widget(_builder, "font-size-label")); _font_variations.get_size_group(1)->add_widget(_font_size); _font_variations.connectChanged([this]{ diff --git a/src/ui/widget/font-variations.cpp b/src/ui/widget/font-variations.cpp index 8ff29f01409fd71320210f853fa69afb326600ee..d63100b630f8737499cd44b37ebc72fabf9b1508 100644 --- a/src/ui/widget/font-variations.cpp +++ b/src/ui/widget/font-variations.cpp @@ -156,9 +156,9 @@ FontVariationAxis::FontVariationAxis(Glib::ustring name_, OTVarAxis const &axis, // << " max: " << axis.maximum // << " val: " << axis.set_val << std::endl; - set_spacing(3); + set_spacing(4); - label = Gtk::make_managed(label_ + ":"); + label = Gtk::make_managed(label_); label->set_tooltip_text(tooltip); label->set_xalign(0.0f); // left-align append(*label); @@ -213,11 +213,6 @@ FontVariations::FontVariations() // std::cout << "FontVariations::FontVariations" << std::endl; set_name("FontVariations"); - set_margin_start(10); - set_margin_end(10); - set_margin_top(10); - set_margin_bottom(10); - _size_group = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL); _size_group_edit = Gtk::SizeGroup::create(Gtk::SizeGroup::Mode::HORIZONTAL); }