1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-08 03:28:20 +02:00

Merge remote-tracking branch 'upstream/master' into Yuvan/CustomBuildProperties

This commit is contained in:
Yuvan Wickramasinghe 2025-05-13 15:14:10 -07:00
commit 524ebaa914
No known key found for this signature in database
49 changed files with 1372 additions and 146 deletions

View file

@ -3461,6 +3461,8 @@ namespace IDE
delete mWorkspace.mDir;
mWorkspace.mDir = newPath;
}
else if (mWorkspace.mDir == null)
mWorkspace.mDir = new String();
List<String> platforms = scope List<String>();
if (IDEApp.sPlatform32Name != null)

View file

@ -1179,14 +1179,18 @@ namespace IDE.ui
if (!docString.IsWhiteSpace)
{
curY += font.GetLineSpacing() + GS!(4);
if (g != null)
{
let docY = curY + font.GetLineSpacing() + GS!(4);
using (g.PushColor(gApp.mSettings.mUISettings.mColors.mAutoCompleteDocText))
docHeight = g.DrawString(docString, curX, curY, .Left, maxDocWidth, .Wrap);
docHeight = g.DrawString(docString, curX, docY, .Left, maxDocWidth, .Wrap);
}
else
docHeight = font.GetWrapHeight(docString, maxDocWidth);
curY += docHeight;
}
extWidth = Math.Max(extWidth, Math.Min(font.GetWidth(docString), maxDocWidth) + GS!(48));

View file

@ -95,6 +95,8 @@ class GitManager
if (!File.Exists(gitPath))
gitPath.Clear();
}
psi.UseShellExecute = false;
#endif
if (gitPath.IsEmpty)
gitPath.Set("git");
@ -103,7 +105,6 @@ class GitManager
psi.SetArguments(mArgs);
if (mPath != null)
psi.SetWorkingDirectory(mPath);
psi.UseShellExecute = false;
psi.RedirectStandardError = true;
psi.RedirectStandardOutput = true;
psi.CreateNoWindow = true;

View file

@ -179,7 +179,12 @@ namespace IDE.util
if (!CheckInit())
return;
String beefBuildPath = scope $"{gApp.mInstallDir}BeefBuild.exe";
#if BF_PLATFORM_WINDOWS
let ext = ".exe";
#else
let ext = "";
#endif
String beefBuildPath = scope $"{gApp.mInstallDir}BeefBuild{ext}";
String args = scope $"-run";
var execInst = gApp.DoRun(beefBuildPath, args, path, .None);
execInst?.mAutoDelete = false;