From 061e4708067a70d9ea0f5a08a3d0cf4f843bef7a Mon Sep 17 00:00:00 2001
From: Ay1nDas <ayandazzz@outlook.com>
Date: Fri, 21 Nov 2025 22:44:07 +0530
Subject: [PATCH 1/2] Fix broken font list from
 https://gitlab.com/inkscape/inkscape/-/merge_requests/7600

Remove margins from 'FontVariations::FontVariations'.
Not let '_font_variations' expand in new font list.
---
 src/ui/widget/font-list.cpp       | 3 ---
 src/ui/widget/font-variations.cpp | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/src/ui/widget/font-list.cpp b/src/ui/widget/font-list.cpp
index 956a606c8e..ad45df8d12 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<Gtk::Box>(_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<Gtk::Label>(_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 8ff29f0140..3a2e2b5340 100644
--- a/src/ui/widget/font-variations.cpp
+++ b/src/ui/widget/font-variations.cpp
@@ -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);
 }
-- 
GitLab


From 9de76e7caeae4007900b5f7f1c1d22424f19d85c Mon Sep 17 00:00:00 2001
From: mike kowalski <michal_kowalski@hotmail.com>
Date: Sun, 23 Nov 2025 15:05:53 -0800
Subject: [PATCH 2/2] Font variation cosmetics fixes

- increase min height of the list of fonts
- fix alignment and spacing
- remove trailing ':' from axes names
---
 share/ui/font-list.glade          | 3 +++
 share/ui/style.css                | 4 ++++
 src/ui/widget/font-variations.cpp | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/share/ui/font-list.glade b/share/ui/font-list.glade
index 20209902a9..ec38dcf4ff 100644
--- a/share/ui/font-list.glade
+++ b/share/ui/font-list.glade
@@ -136,6 +136,7 @@
     </property>
   </object>
   <object class="GtkGrid" id="main-grid">
+    <property name="name">FontList</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="column-spacing">3</property>
@@ -164,6 +165,7 @@
         </layout>
         <style>
           <class name="active-background"></class>
+          <class name="font-list"></class>
         </style>
       </object>
     </child>
@@ -560,6 +562,7 @@
         </layout>
         <style>
           <class name="active-background"></class>
+          <class name="font-list"></class>
         </style>
       </object>
     </child>
diff --git a/share/ui/style.css b/share/ui/style.css
index 15e7972653..724b86c298 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-variations.cpp b/src/ui/widget/font-variations.cpp
index 3a2e2b5340..d63100b630 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<Gtk::Label>(label_ + ":");
+    label = Gtk::make_managed<Gtk::Label>(label_);
     label->set_tooltip_text(tooltip);
     label->set_xalign(0.0f); // left-align
     append(*label);
-- 
GitLab