Merge branch 'master' into ctrlclick-recipe-hints

DaleStan · Aug 1, 2024 · 8dbcba3 · 8dbcba3
2 parents 5317f13 + 439f227
commit 8dbcba3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Yafc/Windows/WelcomeScreen.cs b/Yafc/Windows/WelcomeScreen.cs
@@ -115,9 +115,14 @@ protected override void BuildContents(ImGui gui) {
                         ShowDropDown(gui, gui.lastRect, ProjectErrorMoreInfo, new Padding(0.5f), 30f);
                     }
                 }
-                if (gui.BuildButton("Back")) {
-                    errorMessage = null;
-                    Rebuild();
+                using (gui.EnterRow()) {
+                    if (gui.BuildButton("Copy to clipboard", SchemeColor.Grey)) {
+                        SDL.SDL_SetClipboardText(errorMessage);
+                    }
+                    if (gui.RemainingRow().BuildButton("Back")) {
+                        errorMessage = null;
+                        Rebuild();
+                    }
                 }
             }
             else {

diff --git a/changelog.txt b/changelog.txt
@@ -15,6 +15,7 @@ Version x.y.z
 Date: 
     Features:
         - Provide hints that contol+clicking can add recipes, or to explain how to change things so it can.
+        - Add "Copy to Clipboard" button for data loading errors
     Bugfixes:
         - Fix regression in fluid variant selection when adding recipes.
 ----------------------------------------------------------------------------------------------------------------------