Merge branch 'main' into fix/workbench-toolbar-fallback

src/Gui/Dialogs/DlgPreferencesImp.cpp

@@ -66,8 +66,10 @@
 
 #include "Dialogs/DlgPreferencesImp.h"
 #include "ui_DlgPreferences.h"
+#include "Application.h"
 #include "BitmapFactory.h"
 #include "MainWindow.h"
+#include "PreferencePackManager.h"
 #include "Tools.h"
 #include "WidgetFactory.h"
 
@@ -834,6 +836,12 @@ void DlgPreferencesImp::restoreDefaults()
             .GetParameterGroupByPath("User parameter:BaseApp/Preferences/General")
             ->SetBool("SaveUserParameter", saveParameter);
 
+        // Re-apply Kindred Create defaults so we don't revert to upstream FreeCAD defaults
+        auto* packMgr = Gui::Application::Instance->prefPackManager();
+        if (packMgr) {
+            packMgr->apply("KindredCreate");
+        }
+
         reject();
     }
 }

src/Gui/Stylesheets/KindredCreate.qss

@@ -1207,6 +1207,7 @@ Gui--OriginSelectorWidget {
     padding: 4px 8px;
     min-width: 70px;
     max-width: 120px;
+    min-height: 20px;
 }
 
 Gui--OriginSelectorWidget:hover {