Skip to content

Commit

Permalink
FixCompileError19092023 (xezno#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
bakscratch authored Sep 19, 2023
1 parent 5b73450 commit 0080df3
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .addon → .sbproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"Schema": 1,
"HasAssets": true,
"AssetsPath": "",
"ResourcePaths": null,
"Resources": null,
"MenuResources": null,
"HasCode": true,
"CodePath": "/code/",
"PackageReferences": [],
Expand Down
2 changes: 1 addition & 1 deletion code/BridgeSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private static BridgeSettings LoadFromDisk()
var jsonInput = File.ReadAllText( SettingsFile );
var settings = JsonSerializer.Deserialize<BridgeSettings>( jsonInput );

settings.ProjectPath ??= Utility.Projects.GetAll().Where( x => x.Active ).FirstOrDefault().GetRootPath();
settings.ProjectPath ??= EditorUtility.Projects.GetAll().Where( x => x.Active ).FirstOrDefault().GetRootPath();

return settings;
}
Expand Down
4 changes: 2 additions & 2 deletions code/Progress/Progress.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ internal static async Task StatementAsync( string title, string message, string
var widget = new Widget( null );
widget.SetSizeMode( SizeMode.Default, SizeMode.CanGrow );

widget.SetLayout( LayoutMode.TopToBottom );
widget.Layout = Layout.Column();
widget.Layout.Margin = 16;
widget.Layout.Spacing = 16;
var label = new Label( message );

widget.Layout.Add( label );

var footer = widget.Layout.Add( LayoutMode.LeftToRight );
var footer = widget.Layout.Add( Layout.Row() );
footer.AddStretchCell( -1 );

bool clicked = false;
Expand Down
2 changes: 1 addition & 1 deletion code/Progress/ProgressWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public ProgressWindow() : base( null )
Content = new Widget( this );
Content.Size = 1;

Content.SetLayout( LayoutMode.TopToBottom );
Content.Layout = Layout.Column();
Content.Layout.Spacing = 1;
AdjustSize();

Expand Down
10 changes: 5 additions & 5 deletions code/SettingsWindow/SettingsWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ public SettingsWindow( Widget parent ) : base( null )

public void CreateUI()
{
SetLayout( LayoutMode.TopToBottom );
Layout = Layout.Column();
Layout.Spacing = 4;

//
// Addon Settings
//
{
var addonSettings = Layout.Add( LayoutMode.TopToBottom );
var addonSettings = Layout.Add( Layout.Column() );
addonSettings.Margin = 20;
addonSettings.Spacing = 8;

var addonName = AddAddonPicker(
"Export Addon",
"The addon where your imports will get sent to",
addonSettings,
Utility.Projects.GetAll() );
EditorUtility.Projects.GetAll() );
}

Layout.AddStretchCell( 1 );
Expand All @@ -52,7 +52,7 @@ public void CreateUI()
// Import Settings
//
{
var importSettings = Layout.Add( LayoutMode.TopToBottom );
var importSettings = Layout.Add( Layout.Column() );
importSettings.Margin = 20;
importSettings.Spacing = 8;

Expand Down Expand Up @@ -100,7 +100,7 @@ public void CreateUI()
{
var buttons = new Widget( this );
buttons.SetSizeMode( SizeMode.Default, SizeMode.CanShrink );
buttons.SetLayout( LayoutMode.LeftToRight );
buttons.Layout = Layout.Row();
buttons.Layout.Margin = 20;
buttons.Layout.Spacing = 8;

Expand Down
2 changes: 1 addition & 1 deletion code/Utils/Template.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public Template( string templatePath )

private string FindBasePath()
{
var addon = Utility.Projects.GetAll().FirstOrDefault( x => x.Config.Ident == "quixel_bridge" );
var addon = EditorUtility.Projects.GetAll().FirstOrDefault( x => x.Config.Ident == "quixel_bridge" );
return addon.GetCodePath();
}

Expand Down

0 comments on commit 0080df3

Please sign in to comment.