WIP, reworking all addresses textboxes...

Signed-off-by: Maximilien Noal <[email protected]>
OpenRakis · Feb 22, 2025 · c53e03f · c53e03f
1 parent de3f910
commit c53e03f
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 293 deletions.
diff --git a/src/Spice86/Converters/HexadecimalToDecimalConverter.cs b/src/Spice86/Converters/HexadecimalToDecimalConverter.cs
diff --git a/src/Spice86/Spice86.csproj b/src/Spice86/Spice86.csproj
@@ -51,9 +51,4 @@
     <ProjectReference Include="..\Spice86.Logging\Spice86.Logging.csproj" />
     <ProjectReference Include="..\Spice86.Shared\Spice86.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UserControls\AddressAutoCompleteBox.axaml.cs">
-      <DependentUpon>AddressAutoCompleteBox.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 </Project>
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml
diff --git a/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs b/src/Spice86/UserControls/AddressAutoCompleteBox.axaml.cs
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml b/src/Spice86/UserControls/HexadecimalTextBox.axaml
diff --git a/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs b/src/Spice86/UserControls/HexadecimalTextBox.axaml.cs
diff --git a/src/Spice86/Views/BreakpointsView.axaml b/src/Spice86/Views/BreakpointsView.axaml
@@ -10,9 +10,6 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Spice86.Views.BreakpointsView"
              x:DataType="viewModels:BreakpointsViewModel">
-	<UserControl.Resources>
-		<converters:HexadecimalToDecimalConverter x:Key="HexadecimalToDecimalConverter" />
-	</UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
@@ -34,7 +31,7 @@
             <DataGrid.Columns>
                 <DataGridCheckBoxColumn IsReadOnly="False" Binding="{Binding IsEnabled}" Header="Is Enabled ?" />
                 <DataGridCheckBoxColumn IsReadOnly="True" Binding="{Binding IsRemovedOnTrigger}" Header="Is removed on trigger ?" />
-                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address, Converter={StaticResource HexadecimalToDecimalConverter}}" Header="Parameter" />
+                <DataGridTextColumn IsReadOnly="True" Binding="{Binding Address, Converter={StaticResource DecimalToHexadecimalConverter}}" Header="Parameter" />
                 <DataGridTextColumn IsReadOnly="True" Binding="{Binding Type}" Header="Type" />
                 <DataGridTextColumn IsReadOnly="False" Binding="{Binding Comment}" Header="Comment" />
             </DataGrid.Columns>
@@ -69,30 +66,35 @@
 											  ItemsSource="{Binding MemoryBreakpointTypes}" />
 								</controls:GroupBox>
 								<controls:GroupBox Grid.Column="1" Header="Memory address">
-									<userControls:AddressAutoCompleteBox
-									State="{Binding State}"
-									ParsedAddress="{Binding MemoryAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+									<TextBox
+									Text="{Binding MemoryAddressValue, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+									Margin="5,0,0,0" />
 								</controls:GroupBox>
 							</Grid>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="Execution"
 								 IsVisible="{Binding IsExecutionBreakpointSelected}">
 							<controls:GroupBox Header="Memory address">
-								<userControls:AddressAutoCompleteBox
-									State="{Binding State}"
-									ParsedAddress="{Binding ExecutionAddressValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<TextBox
+									Text="{Binding ExecutionAddressValue,
+									Mode=TwoWay,
+									UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="Interrupt"
 								 IsVisible="{Binding IsInterruptBreakpointSelected}">
 							<controls:GroupBox Header="Interrupt Number">
-								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding InterruptNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<NumericUpDown Text="{Binding InterruptNumber,
+												 Mode=TwoWay,
+												 UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<controls:GroupBox Grid.Row="0" Header="I/O Port"
 								 IsVisible="{Binding IsIoPortBreakpointSelected}">
 							<controls:GroupBox Header="I/O Port Number">
-								<userControls:HexadecimalTextBox ParsedHexadecimalNumber="{Binding IoPortNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="5,0,0,0" />
+								<NumericUpDown
+									Text="{Binding IoPortNumber, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+									Margin="5,0,0,0" />
 							</controls:GroupBox>
 						</controls:GroupBox>
 						<StackPanel

diff --git a/src/Spice86/Views/DisassemblyView.axaml b/src/Spice86/Views/DisassemblyView.axaml
@@ -47,11 +47,10 @@
 			<StackPanel Orientation="Vertical" Grid.Column="3">
 				<Label HorizontalAlignment="Center" Content="Start Address" />
 				<Grid ColumnDefinitions="*,*">
-					<userControls:AddressAutoCompleteBox Name="StartAddressTextBox"
+					<TextBox Name="StartAddressTextBox"
 						Grid.Column="0"
-						Width="150"
-						State="{Binding State}"
-						ParsedAddress="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+						MinWidth="150"
+						Text="{Binding StartAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 				</Grid>
 			</StackPanel>
 			<StackPanel Orientation="Vertical" Grid.Column="4">
@@ -226,8 +225,8 @@
 						<StackPanel
 							Grid.Row="1"
 							Orientation="Vertical">
-							<userControls:AddressAutoCompleteBox
-								ParsedAddress="{Binding BreakpointAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
+							<TextBox
+								Text="{Binding BreakpointAddress, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
 						</StackPanel>
 					</Grid>
 					<StackPanel