fix console size, upscale button

the-database · May 26, 2024 · 3aa6eef · 3aa6eef
1 parent 76e9d65
commit 3aa6eef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/AnimeJaNaiConverterGui/ViewModels/MainWindowViewModel.cs b/AnimeJaNaiConverterGui/ViewModels/MainWindowViewModel.cs
@@ -814,8 +814,11 @@ public bool Valid
             set
             {
                 this.RaiseAndSetIfChanged(ref _valid, value);
-                this.RaisePropertyChanged(nameof(Vm.UpscaleEnabled));
-                this.RaisePropertyChanged(nameof(Vm.LeftStatus));
+                if (Vm != null)
+                {
+                    Vm.RaisePropertyChanged(nameof(Vm.UpscaleEnabled));
+                    Vm.RaisePropertyChanged(nameof(Vm.LeftStatus));
+                }
             }
         }
 

diff --git a/AnimeJaNaiConverterGui/Views/MainWindow.axaml b/AnimeJaNaiConverterGui/Views/MainWindow.axaml
@@ -99,7 +99,7 @@
       <!-- Main Form -->
       <DockPanel Grid.Column="1" IsVisible="{Binding ShowMainForm}">
         <!--Bottom Status Panel -->
-        <StackPanel DockPanel.Dock="Bottom" IsVisible="{Binding !IsExtractingBackend}">
+        <StackPanel DockPanel.Dock="Bottom">
 
           <StackPanel Orientation="Horizontal">
             <Button Margin="20,10,0,10" FontWeight="Bold" Background="Green" IsEnabled="{Binding UpscaleEnabled}" Command="{Binding RunUpscale}">
@@ -118,8 +118,15 @@
           </StackPanel>
 
           <StackPanel IsVisible="{Binding ShowConsole}" >
-            <TextBlock Margin="20,10,0,0" FontWeight="Bold" Text="Console"></TextBlock>
-            <ScrollViewer x:Name="ConsoleScrollViewer" Margin="0,10,0,0" Background="#111111" Height="500" Width="500" HorizontalScrollBarVisibility="Auto" Foreground="Gray"  PropertyChanged="ConsoleScrollViewer_PropertyChanged">
+            <DockPanel>
+              <TextBlock DockPanel.Dock="Left" Margin="20,10,0,0" FontWeight="Bold" Text="Console"></TextBlock>
+              <ToggleButton DockPanel.Dock="Right" Margin="0,0,20,0" IsChecked="{Binding !ShowConsole}">
+                <materialIcons:MaterialIcon Kind="Close" />
+              </ToggleButton>
+              <Rectangle/>
+            </DockPanel>
+
+            <ScrollViewer x:Name="ConsoleScrollViewer" Margin="0,10,0,0" Background="#111111" Height="450" HorizontalAlignment="Stretch" HorizontalScrollBarVisibility="Auto" Foreground="Gray"  PropertyChanged="ConsoleScrollViewer_PropertyChanged">
               <SelectableTextBlock x:Name="ConsoleTextBlock" Margin="20" Text="{Binding ConsoleText}" FontFamily="Consolas" PropertyChanged="ConsoleTextBlock_PropertyChanged" />
             </ScrollViewer>
           </StackPanel>

diff --git a/AnimeJaNaiConverterGui/Views/MainWindow.axaml.cs b/AnimeJaNaiConverterGui/Views/MainWindow.axaml.cs
@@ -125,7 +125,7 @@ private void MainWindow_Resized(object? sender, WindowResizedEventArgs e)
             var consoleScrollViewer = this.FindControl<ScrollViewer>("ConsoleScrollViewer");
             if (consoleScrollViewer != null)
             {
-                consoleScrollViewer.Width = Width - 40; // Adjust the width as needed
+                consoleScrollViewer.Width = Width - 340; // Adjust the width as needed
             }
 
         }