refactor: Cleanup

furesoft · Oct 27, 2024 · be56f27 · be56f27
1 parent 8d6d3cc
commit be56f27
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/MimaSim/MimaSim/Controls/MimaComponents/Wrappers/ControlUnitWrapper.axaml b/src/MimaSim/MimaSim/Controls/MimaComponents/Wrappers/ControlUnitWrapper.axaml
@@ -10,14 +10,14 @@
              x:Class="MimaSim.Controls.MimaComponents.Wrappers.ControlUnitWrapper">
   <Canvas>
      <c:RegisterControl Register="FLAG" Width="45" Canvas.Left="100" Canvas.Top="15" me:RegisterConnector.IsConnected="True" />
-     <c:RegisterControl Register="SCR" Width="45" Canvas.Left="100" Canvas.Top="45" me:RegisterConnector.IsConnected="True" />
+     <c:RegisterControl Register="SCR" Width="45" Canvas.Left="5" Canvas.Top="245" me:RegisterConnector.IsConnected="True" />
 
      <c:ControlUnitControl Canvas.Top="0" Canvas.Left="0" Width="100" Height="220" />
 
      <c:ClockControl Name="clock" Tag="{me:GetClockFrequency}" Canvas.Top="5" Canvas.Left="5" Width="35" Height="35" ToolTip.Tip="{Binding ElementName=clock, Path=Tag}" />
 
-     <c:BusControl b:BusRegistry.Id="controlunit_iar" Canvas.Left="15" Canvas.Top="220" Width="15" Height="25" State="None" />
-     <c:RegisterControl Register="IAR" Canvas.Left="5" Canvas.Top="245" me:RegisterConnector.IsConnected="True" />
+     <c:BusControl b:BusRegistry.Id="controlunit_scr" Canvas.Left="20" Canvas.Top="220" Width="15" Height="25" State="None" />
+     <c:RegisterControl Register="IAR" Canvas.Left="100" Canvas.Top="45" me:RegisterConnector.IsConnected="True" />
 
      <c:BusControl b:BusRegistry.Id="controlunit_sp" Canvas.Left="65" Canvas.Top="220" Width="15" Height="25" State="None" />
      <c:RegisterControl Register="SP" Canvas.Left="55" Canvas.Top="245" me:RegisterConnector.IsConnected="True" />

diff --git a/src/MimaSim/MimaSim/Controls/Popups/HelpPopup.axaml b/src/MimaSim/MimaSim/Controls/Popups/HelpPopup.axaml
@@ -22,7 +22,7 @@
                                MinWidth="200" LeftHeader="Register" RightHeader="Byte" MaxHeight="400"
                                VerticalAlignment="Top" />
             <c:MapTableControl ItemTemplate="{StaticResource cellTemplate}" ItemsSource="{Binding OpcodesTableItems}"
-                               MinWidth="200" LeftHeader="Mov" RightHeader="Byte" MaxHeight="400"
+                               MinWidth="200" LeftHeader="Mnemnonic" RightHeader="Byte" MaxHeight="400"
                                VerticalAlignment="Top" />
 
             <StackPanel Orientation="Vertical">

diff --git a/src/MimaSim/MimaSim/Controls/ProgramEditorControl.axaml b/src/MimaSim/MimaSim/Controls/ProgramEditorControl.axaml
@@ -21,7 +21,9 @@
         </i:Interaction.Behaviors>
     </avaloniaEdit:TextEditor>
 
-    <ComboBox Grid.Row="2" Grid.Column="0" MinWidth="110" HorizontalAlignment="Right" VerticalAlignment="Bottom" ItemsSource="{Binding LanguageNames}"  SelectedItem="{Binding SelectedLanguage, Mode=TwoWay}" />
-    <ComboBox Grid.Row="2" Grid.Column="1" MinWidth="110" HorizontalAlignment="Right" VerticalAlignment="Bottom" ItemsSource="{Binding SampleNames, Mode=TwoWay}"  SelectedItem="{Binding SelectedSample, Mode=TwoWay}" />
-  </Grid>
+    <StackPanel Spacing="10" Grid.Row="2" Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" >
+        <ComboBox MinWidth="110" ItemsSource="{Binding LanguageNames}" SelectedItem="{Binding SelectedLanguage, Mode=TwoWay}" />
+        <ComboBox  MinWidth="110" ItemsSource="{Binding SampleNames, Mode=TwoWay}" SelectedItem="{Binding SelectedSample, Mode=TwoWay}" />
+    </StackPanel>
+   </Grid>
 </UserControl>