Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debugger: Tile Viewer - Add navigate by tile button to Address row #57

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+63 −7
Open

Debugger: Tile Viewer - Add navigate by tile button to Address row #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d65e0a
Debugger: Tile Viewer - Add navigate by tile button to Address row
gzip Apr 4, 2024
5d96296
Merge branch 'master' into tile_viewer_nav
gzip Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions UI/Debugger/Controls/HexInput.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:c="using:Mesen.Controls"
xmlns:u="using:Mesen.Utilities"
mc:Ignorable="d"
MinWidth="120"
MinWidth="140"
x:Name="root"
HorizontalAlignment="Stretch"
x:Class="Mesen.Debugger.Controls.HexInput"
Expand All @@ -16,11 +16,14 @@
<StreamGeometry x:Key="FirstButton">M7,0 L2,5 7,10 M0,0 L0,10</StreamGeometry>
<StreamGeometry x:Key="LargeButton">M0,0 L5,5 0,10 M7,0 L7,10</StreamGeometry>

<StreamGeometry x:Key="PrevLargeButton">M7,0 L3,5 7,10 M3,0 L0,5 3,10</StreamGeometry>
<StreamGeometry x:Key="NextLargeButton">M0,0 L4,5 0,10 M4,0 L7,5 4,10</StreamGeometry>
<StreamGeometry x:Key="PrevLargeButton">M7,0 L3,4 7,8 M3,0 L-1,4 3,8</StreamGeometry>
<StreamGeometry x:Key="NextLargeButton">M-1,0 L3,4 -1,8 M3,0 L7,4 3,8</StreamGeometry>

<StreamGeometry x:Key="PrevSmallButton">M5,0 L0,5 5,10</StreamGeometry>
<StreamGeometry x:Key="NextSmallButton">M0,0 L5,5 0,10</StreamGeometry>
<StreamGeometry x:Key="PrevMediumButton">M2,0 L-2,4 2,8</StreamGeometry>
<StreamGeometry x:Key="NextMediumButton">M0,0 L4,4 0,8</StreamGeometry>

<StreamGeometry x:Key="PrevSmallButton">M0,1 H6</StreamGeometry>
<StreamGeometry x:Key="NextSmallButton">M0,3 H6 M3,0 V6</StreamGeometry>
</UserControl.Resources>

<UserControl.Styles>
Expand All @@ -30,10 +33,11 @@
<Setter Property="Padding" Value="4 0" />
<Setter Property="MinHeight" Value="21" />
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="HorizontalContentAlignment" Value="Center"/>
</Style>
<Style Selector="Path">
<Setter Property="Stroke" Value="{DynamicResource ButtonForeground}"/>
<Setter Property="StrokeThickness" Value="2"/>
<Setter Property="StrokeThickness" Value="0.75"/>
</Style>
<Style Selector="RepeatButton:disabled Path">
<Setter Property="Stroke" Value="{DynamicResource ButtonForegroundDisabled}"/>
Expand All @@ -44,12 +48,18 @@
<RepeatButton Command="{Binding DecrementLarge}" DockPanel.Dock="Left" ToolTip.Tip="Previous page">
<Path Data="{StaticResource PrevLargeButton}" />
</RepeatButton>
<RepeatButton Command="{Binding DecrementMedium}" DockPanel.Dock="Left" ToolTip.Tip="Previous tile" Margin="-1 0 0 0">
<Path Data="{StaticResource PrevMediumButton}"/>
</RepeatButton>
<RepeatButton Command="{Binding DecrementSmall}" DockPanel.Dock="Left" ToolTip.Tip="Previous byte" Margin="-1 0 0 0">
<Path Data="{StaticResource PrevSmallButton}"/>
</RepeatButton>
<RepeatButton Command="{Binding IncrementLarge}" DockPanel.Dock="Right" ToolTip.Tip="Next page">
<Path Data="{StaticResource NextLargeButton}" />
</RepeatButton>
<RepeatButton Command="{Binding IncrementMedium}" DockPanel.Dock="Right" ToolTip.Tip="Next tile" Margin="0 0 -1 0">
<Path Data="{StaticResource NextMediumButton}" />
</RepeatButton>
<RepeatButton Command="{Binding IncrementSmall}" DockPanel.Dock="Right" ToolTip.Tip="Next byte" Margin="0 0 -1 0">
<Path Data="{StaticResource NextSmallButton}" />
</RepeatButton>
Expand Down
36 changes: 36 additions & 0 deletions UI/Debugger/Controls/HexInput.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public class HexInput : UserControl
public static readonly StyledProperty<int?> MaximumProperty = AvaloniaProperty.Register<HexInput, int?>(nameof(Maximum));
public static readonly StyledProperty<int?> MinimumProperty = AvaloniaProperty.Register<HexInput, int?>(nameof(Minimum));
public static readonly StyledProperty<int> SmallIncrementProperty = AvaloniaProperty.Register<HexInput, int>(nameof(SmallIncrement));
public static readonly StyledProperty<int> MediumIncrementProperty = AvaloniaProperty.Register<HexInput, int>(nameof(MediumIncrement));
public static readonly StyledProperty<int> LargeIncrementProperty = AvaloniaProperty.Register<HexInput, int>(nameof(LargeIncrement));

public int Value
Expand All @@ -39,6 +40,12 @@ public int SmallIncrement
set { SetValue(SmallIncrementProperty, value); }
}

public int MediumIncrement
{
get { return GetValue(MediumIncrementProperty); }
set { SetValue(MediumIncrementProperty, value); }
}

public int LargeIncrement
{
get { return GetValue(LargeIncrementProperty); }
Expand Down Expand Up @@ -70,6 +77,11 @@ private void OnNextLargeClick(object sender, RoutedEventArgs e)
SetValue(LargeIncrement);
}

private void OnNextMediumClick(object sender, RoutedEventArgs e)
{
SetValue(MediumIncrement);
}

private void OnNextSmallClick(object sender, RoutedEventArgs e)
{
SetValue(SmallIncrement);
Expand Down Expand Up @@ -97,6 +109,17 @@ public bool CanDecrementSmall(object parameter)
return Value > 0;
}

public void DecrementMedium(object parameter)
{
SetValue(-MediumIncrement);
}

[DependsOn(nameof(Value))]
public bool CanDecrementMedium(object parameter)
{
return Value >= MediumIncrement;
}

public void IncrementLarge(object parameter)
{
SetValue(LargeIncrement);
Expand All @@ -110,6 +133,19 @@ public bool CanIncrementLarge(object parameter)
return Value < Maximum && Value < Maximum - LargeIncrement + 1;
}

public void IncrementMedium(object parameter)
{
SetValue(MediumIncrement);
}

[DependsOn(nameof(Value))]
[DependsOn(nameof(Maximum))]
[DependsOn(nameof(MediumIncrement))]
public bool CanIncrementMedium(object parameter)
{
return Value < Maximum && Value < Maximum - MediumIncrement + 1;
}

public void IncrementSmall(object parameter)
{
SetValue(SmallIncrement);
Expand Down
11 changes: 10 additions & 1 deletion UI/Debugger/ViewModels/TileViewerViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class TileViewerViewModel : DisposableViewModel, ICpuTypeModel, IMouseOve
[Reactive] public int SelectedPalette { get; set; } = 0;

[Reactive] public int AddressIncrement { get; private set; }
[Reactive] public int TileIncrement { get; private set; }
[Reactive] public int MaximumAddress { get; private set; } = int.MaxValue;

[Reactive] public int GridSizeX { get; set; } = 8;
Expand Down Expand Up @@ -235,12 +236,20 @@ public TileViewerViewModel(CpuType cpuType, PictureViewer picViewer, Window? wnd
}));

AddDisposable(this.WhenAnyValue(x => x.Config.ColumnCount, x => x.Config.RowCount, x => x.Config.Format).Subscribe(x => {

PixelSize tileSize = Config.Format.GetTileSize();

int bitsPerPixel = Config.Format.GetBitsPerPixel();
int bytesPerTile = tileSize.Width * tileSize.Height * bitsPerPixel / 8;

//Enforce min/max values for column/row counts
Config.ColumnCount = ColumnCount;
Config.RowCount = RowCount;

ApplyColumnRowCountRestrictions();
AddressIncrement = ColumnCount * RowCount * 8 * 8 * Config.Format.GetBitsPerPixel() / 8;

TileIncrement = bytesPerTile;
AddressIncrement = ColumnCount * RowCount * bytesPerTile;
}));

AddDisposable(this.WhenAnyValue(x => x.Config.Source).Subscribe(memType => {
Expand Down
1 change: 1 addition & 0 deletions UI/Debugger/Windows/TileViewerWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
Grid.Column="1" Grid.Row="3"
Value="{Binding Config.StartAddress}"
LargeIncrement="{Binding AddressIncrement}"
MediumIncrement="{Binding TileIncrement}"
SmallIncrement="1"
Minimum="0"
Maximum="{Binding MaximumAddress}"
Expand Down