Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-14 22:34:09 +02:00
Code Activity

Made workspace user file try to use workspace-relative paths

Browse source
This commit is contained in:
Brian Fiete 2020-09-17 07:12:46 -07:00
parent 10da44e341
commit 980132c3cc
4 changed files with 77 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

32
IDE/src/ui/SourceViewPanel.bf
View file

@ -678,9 +678,15 @@ namespace IDE.ui
return;
data.Add("Type", "SourceViewPanel");
data.Add("FilePath", mFilePath);
String relPath = scope String();
gApp.mWorkspace.GetWorkspaceRelativePath(mFilePath, relPath);
data.Add("FilePath", relPath);
if (mAliasFilePath != null)
data.Add("AliasFilePath", mAliasFilePath);
{
String relAliasPath = scope .();
gApp.mWorkspace.GetWorkspaceRelativePath(mAliasFilePath, relAliasPath);
data.Add("AliasFilePath", relAliasPath);
}
data.ConditionalAdd("CursorPos", mEditWidget.Content.CursorTextPos, 0);
data.ConditionalAdd("VertPos", mEditWidget.mVertScrollbar.mContentPos, 0);
if (mProjectSource != null)
@ -691,15 +697,21 @@ namespace IDE.ui
{
base.Deserialize(data);
String filePath = scope String();
data.GetString("FilePath", filePath);
String relFilePath = scope String();
data.GetString("FilePath", relFilePath);
String absFilePath = scope String();
gApp.mWorkspace.GetWorkspaceAbsPath(relFilePath, absFilePath);
String projectName = scope String();
data.GetString("ProjectName", projectName);
var aliasFilePath = scope String();
data.GetString("AliasFilePath", aliasFilePath);
if (!aliasFilePath.IsEmpty)
mAliasFilePath = new String(aliasFilePath);
var relAliasFilePath = scope String();
data.GetString("AliasFilePath", relAliasFilePath);
if (!relAliasFilePath.IsEmpty)
{
mAliasFilePath = new String();
gApp.mWorkspace.GetWorkspaceAbsPath(relAliasFilePath, mAliasFilePath);
}
bool foundProjectSource = false;
if (projectName != null)
@ -708,7 +720,7 @@ namespace IDE.ui
if (project != null)
{
String relPath = scope String();
project.GetProjectRelPath(filePath, relPath);
project.GetProjectRelPath(absFilePath, relPath);
var projectItem = IDEApp.sApp.FindProjectItem(project.mRootFolder, relPath);
if (projectItem != null)
{
@ -721,7 +733,7 @@ namespace IDE.ui
if (!foundProjectSource)
{
if (!Show(filePath, true))
if (!Show(absFilePath, true))
return false;
}
int32 cursorPos = data.GetInt("CursorPos");