github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Matt Parker
2025-08-07 02:11:04 +10:00
parent 61a7ea625b
commit b39b5eecc5
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SharpIDE.Photino/Components/IdeSettingsDialog.razor
View File

@@ -4,7 +4,7 @@
<MudStack Class="ml-2 mr-4 mb-2"> <MudStack Class="ml-2 mr-4 mb-2">
<MudSwitch @bind-Value="@AppState.IdeSettings.AutoOpenLastSolution" Label="Automatically open last solution" Color="Color.Primary" /> <MudSwitch @bind-Value="@AppState.IdeSettings.AutoOpenLastSolution" Label="Automatically open last solution" Color="Color.Primary" />
<MudSwitch @bind-Value="@AppState.IdeSettings.AutoOpenTerminalOnLaunch" Label="Automatically open terminal when SharpIDE starts" Color="Color.Primary" /> <MudSwitch @bind-Value="@AppState.IdeSettings.AutoOpenTerminalOnLaunch" Disabled="true" Label="Automatically open terminal when SharpIDE starts" Color="Color.Primary" />
<MudSwitch @bind-Value="@AppState.IdeSettings.OpenTerminalOnBuildRebuildRestore" Label="Open the terminal on Build, Rebuild, Restore" Color="Color.Primary" /> <MudSwitch @bind-Value="@AppState.IdeSettings.OpenTerminalOnBuildRebuildRestore" Label="Open the terminal on Build, Rebuild, Restore" Color="Color.Primary" />
</MudStack> </MudStack>

5
src/SharpIDE.Photino/Components/SidebarIconButton.razor
View File

@@ -1,4 +1,4 @@
<MudButton Style="min-width: 20px;" FullWidth="true" OnClick="@OnClick"> <MudButton Style="min-width: 20px;" FullWidth="true" OnClick="@OnClick" Variant="@(Selected ? Variant.Filled : Variant.Text)">
<MudStack AlignItems="AlignItems.Center" Spacing="0"> <MudStack AlignItems="AlignItems.Center" Spacing="0">
<MudIcon Icon="@Icon" Color="Color.Inherit"/> <MudIcon Icon="@Icon" Color="Color.Inherit"/>
<MudText Style="margin-top: 1px" Typo="Typo.caption">@Text</MudText> <MudText Style="margin-top: 1px" Typo="Typo.caption">@Text</MudText>
@@ -12,6 +12,9 @@
[Parameter, EditorRequired] [Parameter, EditorRequired]
public string? Text { get; set; } public string? Text { get; set; }
[Parameter, EditorRequired]
public bool Selected { get; set; }
[Parameter] [Parameter]
public EventCallback OnClick { get; set; } public EventCallback OnClick { get; set; }
} }

28
src/SharpIDE.Photino/Layout/MainLayout.razor
View File

@@ -29,9 +29,6 @@
</MudStack> </MudStack>
<MudSpacer/> <MudSpacer/>
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1"> <MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
<MudButton Style="min-width: 20px;" OnClick="@TerminalDrawerToggle">
<MudIcon Icon="@Icons.Material.Filled.Terminal" Size="Size.Medium" Color="Color.Default"/>
</MudButton>
<MudButton Style="min-width: 20px;"> <MudButton Style="min-width: 20px;">
<MudIcon Icon="@Icons.Material.Filled.PlayArrow" Size="Size.Medium" Color="Color.Success"/> <MudIcon Icon="@Icons.Material.Filled.PlayArrow" Size="Size.Medium" Color="Color.Success"/>
</MudButton> </MudButton>
@@ -45,10 +42,10 @@
<MudStack Style="height: 100%; overflow: hidden" Row="true" Spacing="0" StretchItems="StretchItems.Middle"> <MudStack Style="height: 100%; overflow: hidden" Row="true" Spacing="0" StretchItems="StretchItems.Middle">
<MudPaper Elevation="6" Height="100%" Style="background-color: var(--mud-palette-appbar-background); z-index: 1200;"> <MudPaper Elevation="6" Height="100%" Style="background-color: var(--mud-palette-appbar-background); z-index: 1200;">
<MudStack AlignItems="AlignItems.Center" Spacing="1" Style="padding: 4px; height: 100%"> <MudStack AlignItems="AlignItems.Center" Spacing="1" Style="padding: 4px; height: 100%">
<SidebarIconButton Icon="@Icons.Material.Filled.FolderOpen" Text="Explorer" OnClick="@DrawerToggle" /> <SidebarIconButton Icon="@Icons.Material.Filled.FolderOpen" Text="Explorer" OnClick="@DrawerToggle" Selected="@_drawerOpen" />
<MudSpacer /> <MudSpacer />
<SidebarIconButton Icon="@Icons.Material.Filled.PlayArrow" Text="Run" OnClick="@SelectRunPanel" /> <SidebarIconButton Icon="@Icons.Material.Filled.PlayArrow" Text="Run" OnClick="@SelectRunPanel" Selected="@(_selectedBottomPanel is BottomPanelType.Run)" />
<SidebarIconButton Icon="@Icons.Material.Filled.Terminal" Text="Build" OnClick="@SelectBuildPanel" /> <SidebarIconButton Icon="@Icons.Material.Filled.Terminal" Text="Build" OnClick="@SelectBuildPanel" Selected="@(_selectedBottomPanel is BottomPanelType.Build)" />
</MudStack> </MudStack>
</MudPaper> </MudPaper>
<div> <div>
@@ -90,16 +87,13 @@
@code { @code {
private bool _drawerOpen = true; private bool _drawerOpen = true;
private bool _terminalDrawerOpen = false; private bool _bottomDrawerOpen = false;
private bool _bottomDrawerOpen = true;
private void DrawerToggle() => _drawerOpen = !_drawerOpen; private void DrawerToggle() => _drawerOpen = !_drawerOpen;
private void TerminalDrawerToggle() => _terminalDrawerOpen = !_terminalDrawerOpen;
private void BottomDrawerToggle() => _bottomDrawerOpen = !_bottomDrawerOpen;
private string? _solutionFilePath; private string? _solutionFilePath;
private SharpIdeSolutionModel? _solutionModel; private SharpIdeSolutionModel? _solutionModel;
private SharpIdeFile? _selectedFile; private SharpIdeFile? _selectedFile;
private BottomPanelType? _selectedBottomPanel = BottomPanelType.Build; private BottomPanelType? _selectedBottomPanel = null;
private string MainContentHeight => _bottomDrawerOpen ? "70%" : "100%"; private string MainContentHeight => _bottomDrawerOpen ? "70%" : "100%";
@@ -122,16 +116,6 @@
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
await LoadSolutionFromInteractivePicker(AppState.IdeSettings.AutoOpenLastSolution); await LoadSolutionFromInteractivePicker(AppState.IdeSettings.AutoOpenLastSolution);
if (AppState.IdeSettings.AutoOpenTerminalOnLaunch)
{
_ = Task.Run(async () =>
{
// The mud drawer is a pain, has an initial state, and won't open if you try to open it before it has rendered (presumably using js)
await Task.Delay(125).ConfigureAwait(false);
_terminalDrawerOpen = true;
await InvokeAsync(StateHasChanged).ConfigureAwait(false);
}).ConfigureAwait(false);
}
} }
private async Task LoadSolutionFromInteractivePicker() => await LoadSolutionFromInteractivePicker(false); private async Task LoadSolutionFromInteractivePicker() => await LoadSolutionFromInteractivePicker(false);
@@ -155,7 +139,7 @@
private async Task RestoreSolution() => await MsBuildSolution(BuildType.Restore); private async Task RestoreSolution() => await MsBuildSolution(BuildType.Restore);
private async Task MsBuildSolution(BuildType buildType) private async Task MsBuildSolution(BuildType buildType)
{ {
if (AppState.IdeSettings.OpenTerminalOnBuildRebuildRestore) _terminalDrawerOpen = true; if (AppState.IdeSettings.OpenTerminalOnBuildRebuildRestore) SelectBuildPanel();
_cancellationTokenSource = new CancellationTokenSource(); _cancellationTokenSource = new CancellationTokenSource();
await BuildService.MsBuildSolutionAsync(_solutionFilePath!, buildType, _cancellationTokenSource.Token); await BuildService.MsBuildSolutionAsync(_solutionFilePath!, buildType, _cancellationTokenSource.Token);
_cancellationTokenSource = null; _cancellationTokenSource = null;