diff --git a/ModerationClient/Views/ClientView.axaml b/ModerationClient/Views/MainWindow/ClientView.axaml
index 0ed8021..ba030e4 100644
--- a/ModerationClient/Views/ClientView.axaml
+++ b/ModerationClient/Views/MainWindow/ClientView.axaml
@@ -7,7 +7,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="ModerationClient.Views.ClientView"
x:DataType="viewModels:ClientViewModel">
- <Grid Width="{Binding $parent.Width}" Height="{Binding $parent.Height}" RowDefinitions="*,20">
+ <Grid Width="{Binding $parent.Width}" Height="{Binding $parent.Height}" RowDefinitions="*, Auto">
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="128" MinWidth="16" />
@@ -19,7 +19,7 @@
<TreeView Grid.Column="0" Background="Red" ItemsSource="{CompiledBinding DisplayedSpaces}" SelectedItem="{CompiledBinding CurrentSpace}">
<TreeView.ItemTemplate>
<TreeDataTemplate ItemsSource="{Binding ChildSpaces}">
- <TextBlock Text="{Binding Name}" />
+ <TextBlock Text="{Binding Name}" Height="20" />
</TreeDataTemplate>
</TreeView.ItemTemplate>
</TreeView>
@@ -28,15 +28,15 @@
<ListBox Grid.Column="2" Background="Green" ItemsSource="{CompiledBinding CurrentSpace.ChildRooms}">
<ListBox.ItemTemplate>
<DataTemplate DataType="viewModels:RoomNode">
- <Label Content="{CompiledBinding Name}" />
+ <TextBlock Text="{CompiledBinding Name}" Height="20" />
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<GridSplitter Grid.Column="3" Background="Black" ResizeDirection="Columns" />
<Rectangle Grid.Column="4" Fill="Blue" />
</Grid>
- <Grid Grid.Row="1" ColumnDefinitions="Auto, *, Auto">
- <Label Grid.Column="2">Text here</Label>
+ <Grid Grid.Row="1" ColumnDefinitions="Auto, *, Auto" Background="Black">
+ <Label Grid.Column="2" Content="{CompiledBinding Status}" />
</Grid>
</Grid>
</UserControl>
\ No newline at end of file
diff --git a/ModerationClient/Views/ClientView.axaml.cs b/ModerationClient/Views/MainWindow/ClientView.axaml.cs
index 894e807..894e807 100644
--- a/ModerationClient/Views/ClientView.axaml.cs
+++ b/ModerationClient/Views/MainWindow/ClientView.axaml.cs
diff --git a/ModerationClient/Views/LoginView.axaml b/ModerationClient/Views/MainWindow/LoginView.axaml
index 10e97c6..5dc6533 100644
--- a/ModerationClient/Views/LoginView.axaml
+++ b/ModerationClient/Views/MainWindow/LoginView.axaml
@@ -7,8 +7,6 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="ModerationClient.Views.LoginView"
x:DataType="viewModels:LoginViewModel">
- <!-- DataContext="{Binding $self}"> -->
- <!-- DataContext="{Binding $self}"> -->
<StackPanel>
<Label>Log in</Label>
<StackPanel Orientation="Horizontal">
diff --git a/ModerationClient/Views/LoginView.axaml.cs b/ModerationClient/Views/MainWindow/LoginView.axaml.cs
index 5e84ace..5e84ace 100644
--- a/ModerationClient/Views/LoginView.axaml.cs
+++ b/ModerationClient/Views/MainWindow/LoginView.axaml.cs
diff --git a/ModerationClient/Views/MainWindow.axaml b/ModerationClient/Views/MainWindow/MainWindow.axaml
index 1c2b396..ef13553 100644
--- a/ModerationClient/Views/MainWindow.axaml
+++ b/ModerationClient/Views/MainWindow/MainWindow.axaml
@@ -5,20 +5,19 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:views="clr-namespace:ModerationClient.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
- x:Class="ModerationClient.Views.MainWindow"
+ x:Class="ModerationClient.Views.MainWindow.MainWindow"
x:DataType="vm:MainWindowViewModel"
Icon="/Assets/avalonia-logo.ico"
Title="ModerationClient"
- Width="640" Height="480">
-
- <Design.DataContext>
- <!-- This only sets the DataContext for the previewer in an IDE,
+ Width="1280" Height="720">
+ <!-- <Design.DataContext> -->
+ <!-- This only sets the DataContext for the previewer in an IDE,
to set the actual DataContext for runtime, set the DataContext property in code (look at App.axaml.cs) -->
- <vm:MainWindowViewModel />
- </Design.DataContext>
+ <!-- <vm:MainWindowViewModel /> -->
+ <!-- </Design.DataContext> -->
- <StackPanel>
- <Grid ColumnDefinitions="Auto, *, Auto">
+ <Grid RowDefinitions="Auto, *">
+ <Grid Grid.Row="0" ColumnDefinitions="Auto, *, Auto" x:Name="TopPanel">
<StackPanel Orientation="Horizontal" Grid.Column="0">
<Label Content="{CompiledBinding Scale}" />
<Label>x</Label>
@@ -29,14 +28,12 @@
</StackPanel>
<Label Grid.Column="2">Press '?' for keybinds</Label>
</Grid>
- <Viewbox>
+ <Viewbox Grid.Row="1">
<ContentControl
Width="{CompiledBinding ChildTargetWidth}"
- Height="{CompiledBinding ChildTargetHeight}"
Background="#222222"
+ Height="{CompiledBinding ChildTargetHeight}"
Content="{CompiledBinding CurrentViewModel}" />
</Viewbox>
-
- </StackPanel>
-
+ </Grid>
</Window>
\ No newline at end of file
diff --git a/ModerationClient/Views/MainWindow.axaml.cs b/ModerationClient/Views/MainWindow/MainWindow.axaml.cs
index 884e90c..01027c1 100644
--- a/ModerationClient/Views/MainWindow.axaml.cs
+++ b/ModerationClient/Views/MainWindow/MainWindow.axaml.cs
@@ -8,13 +8,17 @@ using Microsoft.Extensions.Hosting;
using ModerationClient.Services;
using ModerationClient.ViewModels;
-namespace ModerationClient.Views;
+namespace ModerationClient.Views.MainWindow;
public partial class MainWindow : Window {
public MainWindow(CommandLineConfiguration cfg, MainWindowViewModel dataContext, IHostApplicationLifetime appLifetime) {
InitializeComponent();
DataContext = dataContext;
- _ = dataContext.AuthService.LoadProfileAsync();
+ _ = dataContext.AuthService.LoadProfileAsync().ContinueWith(x => {
+ if (x.IsFaulted) {
+ Console.WriteLine("Failed to load profile: " + x.Exception);
+ }
+ });
Console.WriteLine("mainwnd");
#if DEBUG
this.AttachDevTools(new DevToolsOptions() {
@@ -25,31 +29,43 @@ public partial class MainWindow : Window {
PropertyChanged += (sender, args) => {
// Console.WriteLine($"MainWindow PropertyChanged: {args.Property.Name} ({args.OldValue} -> {args.NewValue})");
switch (args.Property.Name) {
- case nameof(Height):
- case nameof(Width): {
+ case nameof(ClientSize): {
if (DataContext is not MainWindowViewModel viewModel) {
- Console.WriteLine("WARN: MainWindowViewModel is null, ignoring height/width change!");
+ Console.WriteLine("WARN: MainWindowViewModel is null, ignoring ClientSize change!");
return;
}
- // Console.WriteLine("height/width changed");
- viewModel.Scale = viewModel.Scale;
+ viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height);
break;
}
}
};
+
+ TopPanel.PropertyChanged += (_, args) => {
+ if (args.Property.Name == nameof(Visual.Bounds)) {
+ if (DataContext is not MainWindowViewModel viewModel) {
+ Console.WriteLine("WARN: MainWindowViewModel is null, ignoring TopPanel.Bounds change!");
+ return;
+ }
+
+ viewModel.PhysicalSize = new Size(ClientSize.Width, ClientSize.Height - TopPanel.Bounds.Height);
+ }
+ };
+
dataContext.AuthService.PropertyChanged += (sender, args) => {
if (args.PropertyName == nameof(MatrixAuthenticationService.IsLoggedIn)) {
if (dataContext.AuthService.IsLoggedIn) {
// dataContext.CurrentViewModel = new ClientViewModel(dataContext.AuthService);
dataContext.CurrentViewModel = App.Current.Host.Services.GetRequiredService<ClientViewModel>();
+ var window = App.Current.Host.Services.GetRequiredService<UserManagementWindow>();
+ window.Show();
}
else {
dataContext.CurrentViewModel = new LoginViewModel(dataContext.AuthService);
}
}
};
- dataContext.MainWindow = this;
+
dataContext.Scale = cfg.Scale;
Width *= cfg.Scale;
Height *= cfg.Scale;
@@ -84,11 +100,25 @@ public partial class MainWindow : Window {
viewModel.Scale = 5.0f;
}
}
- else if (e.Key == Key.K && e.KeyModifiers == KeyModifiers.Control) {
- if(viewModel.CurrentViewModel is ClientViewModel clientViewModel) {
- Console.WriteLine("QuickSwitcher invoked");
+ else if (e.KeyModifiers == KeyModifiers.Control) {
+ if (e.Key == Key.K) {
+ if (viewModel.CurrentViewModel is ClientViewModel clientViewModel) {
+ Console.WriteLine("QuickSwitcher invoked");
+ }
+ else Console.WriteLine("WARN: CurrentViewModel is not ClientViewModel, ignoring Quick Switcher");
+ }
+ else if (e.Key == Key.U ) {
+ Console.WriteLine("UserManagementWindow invoked");
+ var window = App.Current.Host.Services.GetRequiredService<UserManagementWindow>();
+ window.Show();
+ }
+ else if (e.Key == Key.F5) {
+ Console.WriteLine("Launching new process");
+ System.Diagnostics.Process.Start(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName, Environment.GetCommandLineArgs());
+ }
+ else if (e.Key == Key.F9) {
+
}
- else Console.WriteLine("WARN: CurrentViewModel is not ClientViewModel, ignoring Quick Switcher");
}
}
}
\ No newline at end of file
|
