Simplify cell info and remove the X overlay

zemoto · zemoto · commit 08f89c116306 · 2022-12-06T20:48:32.000-05:00
diff --git a/EnhancePoE/Model/Cell.cs b/EnhancePoE/Model/Cell.cs
@@ -1,55 +1,43 @@
 ﻿using System.ComponentModel;
-using System.Windows.Controls;
 
 namespace EnhancePoE.Model
 {
    public class Cell : INotifyPropertyChanged
    {
+      public event PropertyChangedEventHandler PropertyChanged;
+      protected virtual void OnPropertyChanged( string propertyName ) => PropertyChanged?.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+
+      public int XIndex { get; }
+      public int YIndex { get; }
+      public Item Item { get; private set; }
+
       private bool _active;
       public bool Active
       {
          get => _active;
-         set
+         private set
          {
             _active = value;
             OnPropertyChanged( nameof( Active ) );
          }
       }
 
-      public event PropertyChangedEventHandler PropertyChanged;
-
-      protected virtual void OnPropertyChanged( string propertyName )
+      public Cell( int x, int y )
       {
-         PropertyChanged?.Invoke( this, new PropertyChangedEventArgs( propertyName ) );
+         XIndex = x;
+         YIndex = y;
       }
 
-      public int XIndex { get; set; }
-      public int YIndex { get; set; }
-      public string ItemID { get; set; }
-
-      public string CellName { get; set; }
-
-      private string _buttonName { get; set; }
-      public string ButtonName
+      public void Activate( ref Item item )
       {
-         get => _buttonName;
-         set
-         {
-            _buttonName = value;
-            OnPropertyChanged( nameof( ButtonName ) );
-         }
+         Active = true;
+         Item = item;
       }
 
-      public Button CellButton { get; set; }
-      public Item CellItem { get; set; }
-      public int TabIndex { get; set; }
-
-      public Cell()
+      public void Deactivate()
       {
-         CellButton = new Button
-         {
-            Content = ButtonName
-         };
+         Active = false;
+         Item = null;
       }
    }
 }
diff --git a/EnhancePoE/Model/Data.cs b/EnhancePoE/Model/Data.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading;
@@ -619,29 +619,21 @@ public static void ActivateNextCell( bool active, Cell cell )
          // check for full sets
          if ( ItemSetListHighlight[0].EmptyItemSlots.Count == 0 )
          {
-            if ( cell != null )
+            if ( cell is not null )
             {
-               var highlightItem = cell.CellItem;
-               stashTab.DeactivateSingleItemCells( cell.CellItem );
-               _ = ItemSetListHighlight[0].ItemList.Remove( highlightItem );
+               _ = ItemSetListHighlight[0].ItemList.Remove( cell.Item );
+               stashTab.DeactivateItemCells( cell.Item );
             }
 
             foreach ( var i in ItemSetListHighlight[0].ItemList )
             {
                stashTab.ActivateItemCells( i );
             }
 
-            // mark item order
-            if ( ItemSetListHighlight[0]?.ItemList.Count > 0 )
-            {
-               stashTab.MarkNextItem( ItemSetListHighlight[0].ItemList[0] );
-            }
-
             if ( ItemSetListHighlight[0].ItemList.Count == 0 )
             {
                ItemSetListHighlight.RemoveAt( 0 );
 
-               // activate next set
                ActivateNextCell( true, null );
             }
          }
diff --git a/EnhancePoE/Model/StashTab.cs b/EnhancePoE/Model/StashTab.cs
@@ -42,12 +42,7 @@ public void InitializeCellList()
          {
             for ( int j = 0; j < size; j++ )
             {
-               OverlayCellsList.Add( new Cell
-               {
-                  Active = false,
-                  XIndex = j,
-                  YIndex = i
-               } );
+               OverlayCellsList.Add( new Cell( j, i ) );
             }
          }
       }
@@ -124,29 +119,29 @@ public void DeactivateItemCells()
       {
          foreach ( var cell in OverlayCellsList )
          {
-            cell.Active = false;
+            cell.Deactivate();
          }
       }
 
-      public void DeactivateSingleItemCells( Item item )
+      public void DeactivateItemCells( Item item )
       {
-         var AllCoordinates = new List<List<int>>();
+         var itemCoordinates = new List<List<int>>();
 
          for ( int i = 0; i < item.w; i++ )
          {
             for ( int j = 0; j < item.h; j++ )
             {
-               AllCoordinates.Add( new List<int> { item.x + i, item.y + j } );
+               itemCoordinates.Add( new List<int> { item.x + i, item.y + j } );
             }
          }
 
          foreach ( var cell in OverlayCellsList )
          {
-            foreach ( var coordinate in AllCoordinates )
+            foreach ( var coordinate in itemCoordinates )
             {
                if ( coordinate[0] == cell.XIndex && coordinate[1] == cell.YIndex )
                {
-                  cell.Active = false;
+                  cell.Deactivate();
                }
             }
          }
@@ -169,23 +164,10 @@ public void ActivateItemCells( Item item )
             {
                if ( coordinate[0] == cell.XIndex && coordinate[1] == cell.YIndex )
                {
-                  cell.Active = true;
-                  cell.CellItem = item;
-                  cell.TabIndex = TabIndex;
+                  cell.Activate( ref item );
                }
             }
          }
       }
-
-      public void MarkNextItem( Item item )
-      {
-         foreach ( var cell in OverlayCellsList )
-         {
-            if ( cell.CellItem == item )
-            {
-               cell.ButtonName = "X";
-            }
-         }
-      }
    }
 }
diff --git a/EnhancePoE/UserControls/DynamicGridControl.xaml b/EnhancePoE/UserControls/DynamicGridControl.xaml
@@ -4,15 +4,16 @@
               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
               xmlns:properties="clr-namespace:EnhancePoE.Properties"
-              mc:Ignorable="d">
+              mc:Ignorable="d"
+              x:Name="Root">
    <ItemsControl.Background>
       <SolidColorBrush Opacity="0"
                        Color="Transparent" />
    </ItemsControl.Background>
    <ItemsControl.ItemsPanel>
       <ItemsPanelTemplate>
-         <UniformGrid Columns="12"
-                      Rows="12" />
+         <UniformGrid Columns="{Binding ElementName=Root, Path=Size}"
+                      Rows="{Binding ElementName=Root, Path=Size}" />
       </ItemsPanelTemplate>
    </ItemsControl.ItemsPanel>
    <ItemsControl.ItemTemplate>
@@ -25,10 +26,7 @@
                         <ControlTemplate TargetType="{x:Type Button}">
                            <Border Background="{TemplateBinding Background}"
                                    BorderBrush="White"
-                                   BorderThickness="0.5">
-                              <ContentPresenter HorizontalAlignment="Center"
-                                                VerticalAlignment="Center" />
-                           </Border>
+                                   BorderThickness="0.5" />
                         </ControlTemplate>
                      </Setter.Value>
                   </Setter>
@@ -48,12 +46,6 @@
                                 Value="{Binding Source={x:Static properties:Settings.Default}, Path=ColorStash}" />
                         <Setter Property="Opacity"
                                 Value="1" />
-                        <Setter Property="Content"
-                                Value="{Binding ButtonName}" />
-                        <Setter Property="Foreground"
-                                Value="White" />
-                        <Setter Property="FontSize"
-                                Value="20" />
                      </DataTrigger>
                   </Style.Triggers>
                </Style>
diff --git a/EnhancePoE/UserControls/DynamicGridControl.xaml.cs b/EnhancePoE/UserControls/DynamicGridControl.xaml.cs
@@ -2,8 +2,11 @@
 {
    public partial class DynamicGridControl
    {
-      public DynamicGridControl()
+      public int Size { get; }
+
+      public DynamicGridControl( int size )
       {
+         Size = size;
          InitializeComponent();
       }
    }
diff --git a/EnhancePoE/UserControls/DynamicGridControlQuad.xaml b/EnhancePoE/UserControls/DynamicGridControlQuad.xaml
diff --git a/EnhancePoE/UserControls/DynamicGridControlQuad.xaml.cs b/EnhancePoE/UserControls/DynamicGridControlQuad.xaml.cs
diff --git a/EnhancePoE/View/StashTabWindow.xaml.cs b/EnhancePoE/View/StashTabWindow.xaml.cs
@@ -80,9 +80,8 @@ public StashTabWindow()
 
          IsOpen = true;
 
-         var stashTabItem = tab.Quad ?
-            new TabItem { Content = new DynamicGridControlQuad { ItemsSource = tab.OverlayCellsList } } :
-            new TabItem { Content = new DynamicGridControl { ItemsSource = tab.OverlayCellsList } };
+         var size = tab.Quad ? 24 : 12;
+         var stashTabItem = new TabItem { Content = new DynamicGridControl( size ) { ItemsSource = tab.OverlayCellsList } };
 
          StashTabOverlayTabControl.ItemsSource = new List<TabItem>() { stashTabItem };
          StashTabOverlayTabControl.SelectedIndex = 0;

Original file line number	Diff line number	Diff line change
`@@ -1,55 +1,43 @@`
`1`	`1`	`using System.ComponentModel;`
`2`		`-using System.Windows.Controls;`
`3`	`2`
`4`	`3`	`namespace EnhancePoE.Model`
`5`	`4`	`{`
`6`	`5`	`public class Cell : INotifyPropertyChanged`
`7`	`6`	`{`
	`7`	`+ public event PropertyChangedEventHandler PropertyChanged;`
	`8`	`+ protected virtual void OnPropertyChanged( string propertyName ) => PropertyChanged?.Invoke( this, new PropertyChangedEventArgs( propertyName ) );`
	`9`	`+`
	`10`	`+ public int XIndex { get; }`
	`11`	`+ public int YIndex { get; }`
	`12`	`+ public Item Item { get; private set; }`
	`13`	`+`
`8`	`14`	`private bool _active;`
`9`	`15`	`public bool Active`
`10`	`16`	`{`
`11`	`17`	`get => _active;`
`12`		`- set`
	`18`	`+ private set`
`13`	`19`	`{`
`14`	`20`	`_active = value;`
`15`	`21`	`OnPropertyChanged( nameof( Active ) );`
`16`	`22`	`}`
`17`	`23`	`}`
`18`	`24`
`19`		`- public event PropertyChangedEventHandler PropertyChanged;`
`20`		`-`
`21`		`- protected virtual void OnPropertyChanged( string propertyName )`
	`25`	`+ public Cell( int x, int y )`
`22`	`26`	`{`
`23`		`- PropertyChanged?.Invoke( this, new PropertyChangedEventArgs( propertyName ) );`
	`27`	`+ XIndex = x;`
	`28`	`+ YIndex = y;`
`24`	`29`	`}`
`25`	`30`
`26`		`- public int XIndex { get; set; }`
`27`		`- public int YIndex { get; set; }`
`28`		`- public string ItemID { get; set; }`
`29`		`-`
`30`		`- public string CellName { get; set; }`
`31`		`-`
`32`		`- private string _buttonName { get; set; }`
`33`		`- public string ButtonName`
	`31`	`+ public void Activate( ref Item item )`
`34`	`32`	`{`
`35`		`- get => _buttonName;`
`36`		`- set`
`37`		`- {`
`38`		`- _buttonName = value;`
`39`		`- OnPropertyChanged( nameof( ButtonName ) );`
`40`		`- }`
	`33`	`+ Active = true;`
	`34`	`+ Item = item;`
`41`	`35`	`}`
`42`	`36`
`43`		`- public Button CellButton { get; set; }`
`44`		`- public Item CellItem { get; set; }`
`45`		`- public int TabIndex { get; set; }`
`46`		`-`
`47`		`- public Cell()`
	`37`	`+ public void Deactivate()`
`48`	`38`	`{`
`49`		`- CellButton = new Button`
`50`		`- {`
`51`		`- Content = ButtonName`
`52`		`- };`
	`39`	`+ Active = false;`
	`40`	`+ Item = null;`
`53`	`41`	`}`
`54`	`42`	`}`
`55`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using System.Threading;`
`@@ -619,29 +619,21 @@ public static void ActivateNextCell( bool active, Cell cell )`
`619`	`619`	`// check for full sets`
`620`	`620`	`if ( ItemSetListHighlight[0].EmptyItemSlots.Count == 0 )`
`621`	`621`	`{`
`622`		`- if ( cell != null )`
	`622`	`+ if ( cell is not null )`
`623`	`623`	`{`
`624`		`- var highlightItem = cell.CellItem;`
`625`		`- stashTab.DeactivateSingleItemCells( cell.CellItem );`
`626`		`- _ = ItemSetListHighlight[0].ItemList.Remove( highlightItem );`
	`624`	`+ _ = ItemSetListHighlight[0].ItemList.Remove( cell.Item );`
	`625`	`+ stashTab.DeactivateItemCells( cell.Item );`
`627`	`626`	`}`
`628`	`627`
`629`	`628`	`foreach ( var i in ItemSetListHighlight[0].ItemList )`
`630`	`629`	`{`
`631`	`630`	`stashTab.ActivateItemCells( i );`
`632`	`631`	`}`
`633`	`632`
`634`		`- // mark item order`
`635`		`- if ( ItemSetListHighlight[0]?.ItemList.Count > 0 )`
`636`		`- {`
`637`		`- stashTab.MarkNextItem( ItemSetListHighlight[0].ItemList[0] );`
`638`		`- }`
`639`		`-`
`640`	`633`	`if ( ItemSetListHighlight[0].ItemList.Count == 0 )`
`641`	`634`	`{`
`642`	`635`	`ItemSetListHighlight.RemoveAt( 0 );`
`643`	`636`
`644`		`- // activate next set`
`645`	`637`	`ActivateNextCell( true, null );`
`646`	`638`	`}`
`647`	`639`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,7 @@ public void InitializeCellList()`
`42`	`42`	`{`
`43`	`43`	`for ( int j = 0; j < size; j++ )`
`44`	`44`	`{`
`45`		`- OverlayCellsList.Add( new Cell`
`46`		`- {`
`47`		`- Active = false,`
`48`		`- XIndex = j,`
`49`		`- YIndex = i`
`50`		`- } );`
	`45`	`+ OverlayCellsList.Add( new Cell( j, i ) );`
`51`	`46`	`}`
`52`	`47`	`}`
`53`	`48`	`}`
`@@ -124,29 +119,29 @@ public void DeactivateItemCells()`
`124`	`119`	`{`
`125`	`120`	`foreach ( var cell in OverlayCellsList )`
`126`	`121`	`{`
`127`		`- cell.Active = false;`
	`122`	`+ cell.Deactivate();`
`128`	`123`	`}`
`129`	`124`	`}`
`130`	`125`
`131`		`- public void DeactivateSingleItemCells( Item item )`
	`126`	`+ public void DeactivateItemCells( Item item )`
`132`	`127`	`{`
`133`		`- var AllCoordinates = new List<List<int>>();`
	`128`	`+ var itemCoordinates = new List<List<int>>();`
`134`	`129`
`135`	`130`	`for ( int i = 0; i < item.w; i++ )`
`136`	`131`	`{`
`137`	`132`	`for ( int j = 0; j < item.h; j++ )`
`138`	`133`	`{`
`139`		`- AllCoordinates.Add( new List<int> { item.x + i, item.y + j } );`
	`134`	`+ itemCoordinates.Add( new List<int> { item.x + i, item.y + j } );`
`140`	`135`	`}`
`141`	`136`	`}`
`142`	`137`
`143`	`138`	`foreach ( var cell in OverlayCellsList )`
`144`	`139`	`{`
`145`		`- foreach ( var coordinate in AllCoordinates )`
	`140`	`+ foreach ( var coordinate in itemCoordinates )`
`146`	`141`	`{`
`147`	`142`	`if ( coordinate[0] == cell.XIndex && coordinate[1] == cell.YIndex )`
`148`	`143`	`{`
`149`		`- cell.Active = false;`
	`144`	`+ cell.Deactivate();`
`150`	`145`	`}`
`151`	`146`	`}`
`152`	`147`	`}`
`@@ -169,23 +164,10 @@ public void ActivateItemCells( Item item )`
`169`	`164`	`{`
`170`	`165`	`if ( coordinate[0] == cell.XIndex && coordinate[1] == cell.YIndex )`
`171`	`166`	`{`
`172`		`- cell.Active = true;`
`173`		`- cell.CellItem = item;`
`174`		`- cell.TabIndex = TabIndex;`
	`167`	`+ cell.Activate( ref item );`
`175`	`168`	`}`
`176`	`169`	`}`
`177`	`170`	`}`
`178`	`171`	`}`
`179`		`-`
`180`		`- public void MarkNextItem( Item item )`
`181`		`- {`
`182`		`- foreach ( var cell in OverlayCellsList )`
`183`		`- {`
`184`		`- if ( cell.CellItem == item )`
`185`		`- {`
`186`		`- cell.ButtonName = "X";`
`187`		`- }`
`188`		`- }`
`189`		`- }`
`190`	`172`	`}`
`191`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,11 @@`
`2`	`2`	`{`
`3`	`3`	`public partial class DynamicGridControl`
`4`	`4`	`{`
`5`		`- public DynamicGridControl()`
	`5`	`+ public int Size { get; }`
	`6`	`+`
	`7`	`+ public DynamicGridControl( int size )`
`6`	`8`	`{`
	`9`	`+ Size = size;`
`7`	`10`	`InitializeComponent();`
`8`	`11`	`}`
`9`	`12`	`}`