Skip to content

Commit 994488a

Browse files
gusmanbgusmanb
committed
Small visual changes
1 parent 9fac79c commit 994488a

1 file changed

Lines changed: 70 additions & 68 deletions

File tree

‎ZXBStudio/DebuggingTools/Memory/Controls/ZXMemoryView.axaml‎

Lines changed: 70 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,75 @@
66
xmlns:svg="using:Avalonia.Svg.Skia"
77
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
88
x:Class="ZXBasicStudio.DebuggingTools.Memory.Controls.ZXMemoryView">
9-
<UserControl.Styles>
10-
<Style Selector="TextBlock">
11-
<Setter Property="Foreground" Value="#ffffff"></Setter>
12-
<Setter Property="VerticalAlignment" Value="Center"></Setter>
13-
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
14-
<Setter Property="TextAlignment" Value="Center"></Setter>
15-
<Setter Property="FontFamily" Value="Cascadia Code,Consolas,Menlo,Monospace"></Setter>
16-
</Style>
17-
</UserControl.Styles>
18-
<UserControl.ContextMenu>
19-
<ContextMenu Placement="Pointer">
20-
<MenuItem Header="ASCII view" Name="mnuAscii" />
21-
<MenuItem Header="HEX view" Name="mnuHex" />
22-
<Separator></Separator>
23-
<MenuItem Header="Search..." Name="mnuSearch" />
24-
<MenuItem Header="Goto" Name="mnuGoto" />
25-
</ContextMenu>
26-
</UserControl.ContextMenu>
27-
<Grid RowDefinitions="auto,*">
28-
<StackPanel Grid.Row="0" Spacing="2" Orientation="Horizontal" Margin="2">
29-
<ToggleButton Classes="dialog" Name="btnMemoryAddressHexFormat" IsChecked="{Binding Path=!#MemoryDecimalMode}" ToolTip.Tip="Display memory address as Hexadecimal">
30-
Hex
31-
</ToggleButton>
32-
<ToggleButton Classes="dialog" Name="btnMemoryAddressDecFormat" IsChecked="{Binding Path=#MemoryDecimalMode}" ToolTip.Tip="Display memory address as Decimal">
33-
Dec
34-
</ToggleButton>
35-
<Line StartPoint="0,2" EndPoint="0,34" Stroke="White" Margin="2,0,2,0"></Line>
36-
<ToggleButton Classes="dialog" Name="btnSwitchHexFormat" IsChecked="{Binding Path=!#ASCIIMode}" ToolTip.Tip="Display memory content as HEX">
37-
Hex
38-
</ToggleButton>
39-
<ToggleButton Classes="dialog" Name="btnSwitchASCIIFormat" IsChecked="{Binding Path=#ASCIIMode}" ToolTip.Tip="Display memory content as ASCII">
40-
ASCII
41-
</ToggleButton>
42-
<Line StartPoint="0,2" EndPoint="0,34" Stroke="White" Margin="2,0,2,0"></Line>
43-
<Border Classes="numericBorder">
44-
<NumericUpDown Margin="3,0" MinWidth="100" Classes="dialog" VerticalAlignment="Center"
45-
HorizontalAlignment="Left" ParsingNumberStyle="Integer" Increment="1" Minimum="0"
46-
Maximum="65535" Value="0" Name="nudAddress">
47-
</NumericUpDown>
48-
</Border>
49-
<Button Classes="dialog" VerticalAlignment="Center" HorizontalAlignment="Right" Padding="7" Name="btnGoto">Goto</Button>
50-
</StackPanel>
51-
<Grid Grid.Row="1" ColumnDefinitions="*,32">
52-
<Grid Grid.Column="0" Grid.Row="1" Name="grdBlocks" ColumnDefinitions="2*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*"
53-
RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*" VerticalAlignment="Stretch"
54-
HorizontalAlignment="Stretch" Background="#303030" Margin="0,0,0,02">
55-
<TextBlock Grid.Column="1">00</TextBlock>
56-
<TextBlock Grid.Column="2">01</TextBlock>
57-
<TextBlock Grid.Column="3">02</TextBlock>
58-
<TextBlock Grid.Column="4">03</TextBlock>
59-
<TextBlock Grid.Column="5">04</TextBlock>
60-
<TextBlock Grid.Column="6">05</TextBlock>
61-
<TextBlock Grid.Column="7">06</TextBlock>
62-
<TextBlock Grid.Column="8">07</TextBlock>
63-
<TextBlock Grid.Column="9">08</TextBlock>
64-
<TextBlock Grid.Column="10">09</TextBlock>
65-
<TextBlock Grid.Column="11">0A</TextBlock>
66-
<TextBlock Grid.Column="12">0B</TextBlock>
67-
<TextBlock Grid.Column="13">0C</TextBlock>
68-
<TextBlock Grid.Column="14">0D</TextBlock>
69-
<TextBlock Grid.Column="15">0E</TextBlock>
70-
<TextBlock Grid.Column="16">0F</TextBlock>
71-
<Separator Margin="0" VerticalAlignment="Bottom" Grid.ColumnSpan="17"></Separator>
72-
<Rectangle Grid.RowSpan="17" HorizontalAlignment="Right" VerticalAlignment="Stretch" Width="1"
73-
Stroke="#444444" StrokeThickness="2" />
74-
</Grid>
75-
<ScrollBar Name="scrFirstRow" Orientation="Vertical" Minimum="0" Maximum="4080" Grid.Column="1"></ScrollBar>
76-
</Grid>
9+
<UserControl.Styles>
10+
<Style Selector="TextBlock">
11+
<Setter Property="Foreground" Value="#ffffff"></Setter>
12+
<Setter Property="VerticalAlignment" Value="Center"></Setter>
13+
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter>
14+
<Setter Property="TextAlignment" Value="Center"></Setter>
15+
<Setter Property="FontFamily" Value="Cascadia Code,Consolas,Menlo,Monospace"></Setter>
16+
</Style>
17+
</UserControl.Styles>
18+
<UserControl.ContextMenu>
19+
<ContextMenu Placement="Pointer">
20+
<MenuItem Header="ASCII view" Name="mnuAscii" />
21+
<MenuItem Header="HEX view" Name="mnuHex" />
22+
<Separator></Separator>
23+
<MenuItem Header="Search..." Name="mnuSearch" />
24+
<MenuItem Header="Goto" Name="mnuGoto" />
25+
</ContextMenu>
26+
</UserControl.ContextMenu>
27+
<Grid RowDefinitions="auto,*">
28+
<Grid ColumnDefinitions="2*,16*">
29+
<StackPanel Grid.Row="0" Spacing="2" Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
30+
<ToggleButton Classes="dialog" Name="btnMemoryAddressHexFormat" IsChecked="{Binding Path=!#MemoryDecimalMode}" ToolTip.Tip="Display memory address as Hexadecimal">
31+
Hex
32+
</ToggleButton>
33+
<ToggleButton Classes="dialog" Name="btnMemoryAddressDecFormat" IsChecked="{Binding Path=#MemoryDecimalMode}" ToolTip.Tip="Display memory address as Decimal">
34+
Dec
35+
</ToggleButton>
36+
</StackPanel>
37+
<StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Center">
38+
<ToggleButton Classes="dialog" Name="btnSwitchHexFormat" IsChecked="{Binding Path=!#ASCIIMode}" ToolTip.Tip="Display memory content as HEX">
39+
Hex
40+
</ToggleButton>
41+
<ToggleButton Classes="dialog" Name="btnSwitchASCIIFormat" IsChecked="{Binding Path=#ASCIIMode}" ToolTip.Tip="Display memory content as ASCII">
42+
ASCII
43+
</ToggleButton>
44+
<Border Classes="numericBorder" Margin="24,0,5,0">
45+
<NumericUpDown Margin="3,0" MinWidth="80" Classes="dialog" VerticalAlignment="Center"
46+
HorizontalAlignment="Left" ParsingNumberStyle="Integer" Increment="1" Minimum="0"
47+
Maximum="65535" Value="0" Name="nudAddress">
48+
</NumericUpDown>
49+
</Border>
50+
<Button Classes="dialog" VerticalAlignment="Center" HorizontalAlignment="Right" Padding="7" Name="btnGoto">Goto</Button>
51+
</StackPanel>
7752
</Grid>
53+
<Grid Grid.Row="1" ColumnDefinitions="*,32">
54+
<Grid Grid.Column="0" Grid.Row="1" Name="grdBlocks" ColumnDefinitions="2*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*"
55+
RowDefinitions="*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*,*" VerticalAlignment="Stretch"
56+
HorizontalAlignment="Stretch" Background="#303030" Margin="0,0,0,02">
57+
<TextBlock Grid.Column="1">00</TextBlock>
58+
<TextBlock Grid.Column="2">01</TextBlock>
59+
<TextBlock Grid.Column="3">02</TextBlock>
60+
<TextBlock Grid.Column="4">03</TextBlock>
61+
<TextBlock Grid.Column="5">04</TextBlock>
62+
<TextBlock Grid.Column="6">05</TextBlock>
63+
<TextBlock Grid.Column="7">06</TextBlock>
64+
<TextBlock Grid.Column="8">07</TextBlock>
65+
<TextBlock Grid.Column="9">08</TextBlock>
66+
<TextBlock Grid.Column="10">09</TextBlock>
67+
<TextBlock Grid.Column="11">0A</TextBlock>
68+
<TextBlock Grid.Column="12">0B</TextBlock>
69+
<TextBlock Grid.Column="13">0C</TextBlock>
70+
<TextBlock Grid.Column="14">0D</TextBlock>
71+
<TextBlock Grid.Column="15">0E</TextBlock>
72+
<TextBlock Grid.Column="16">0F</TextBlock>
73+
<Separator Margin="0" VerticalAlignment="Bottom" Grid.ColumnSpan="17"></Separator>
74+
<Rectangle Grid.RowSpan="17" HorizontalAlignment="Right" VerticalAlignment="Stretch" Width="1"
75+
Stroke="#444444" StrokeThickness="2" />
76+
</Grid>
77+
<ScrollBar Name="scrFirstRow" Orientation="Vertical" Minimum="0" Maximum="4080" Grid.Column="1"></ScrollBar>
78+
</Grid>
79+
</Grid>
7880
</UserControl>

0 commit comments

Comments
 (0)