use default ByteToHex conversion to optimized refresh

delete the support of VerticalScrollBarVisibility
abbaye · Aug 27, 2017 · a6dfbbe · a6dfbbe
1 parent 9458893
commit a6dfbbe
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 67 deletions.
diff --git a/WPFHexaEditor.Control/Core/Bytes/ByteConverters.cs b/WPFHexaEditor.Control/Core/Bytes/ByteConverters.cs
@@ -152,7 +152,7 @@ public static byte[] HexToByte(string hex)
 
         public static bool HexToByte(string hex, out byte b)
         {
-            return byte.TryParse(hex, System.Globalization.NumberStyles.HexNumber, CultureInfo.InvariantCulture, out b);
+            return byte.TryParse(hex, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out b);
         }
 
         public static long HexLiteralToLong(string hex)

diff --git a/WPFHexaEditor.Control/HexaEditor.xaml.cs b/WPFHexaEditor.Control/HexaEditor.xaml.cs
@@ -127,10 +127,11 @@ public HexaEditor()
             InitializeComponent();
 
             //Load default build-in TBL
-            TypeOfCharacterTable = CharacterTableType.TBLFile;
-            LoadDefaultTBL(DefaultCharacterTableType.ASCII);
+            //TypeOfCharacterTable = CharacterTableType.TBLFile;
+            //LoadDefaultTBL(DefaultCharacterTableType.ASCII);
 
             //Refresh view
+            UpdateVerticalScroll();
             RefreshView(true);
 
             DataContext = this;
@@ -1244,8 +1245,6 @@ private void Control_MoveNext(object sender, EventArgs e)
             //Call moveright event
             Control_MoveRight(sender, new EventArgs());
         }
-
-
         #endregion Selection Property/Methods/Event
 
         #region Copy/Paste/Cut Methods
@@ -1567,41 +1566,7 @@ private static void StringDataVisibility_ValidateValue(DependencyObject d, Depen
                 }
             }
         }
-
-        /// <summary>
-        /// Set or Get value for change visibility of vertical scroll bar
-        /// </summary>
-        public Visibility VerticalScrollBarVisibility
-        {
-            get { return (Visibility)GetValue(VerticalScrollBarVisibilityProperty); }
-            set { SetValue(VerticalScrollBarVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty VerticalScrollBarVisibilityProperty =
-            DependencyProperty.Register("VerticalScrollBarVisibility", typeof(Visibility), typeof(HexaEditor),
-                new FrameworkPropertyMetadata(Visibility.Visible,
-                    new PropertyChangedCallback(VerticalScrollBarVisibility_ValueChanged),
-                    new CoerceValueCallback(Visibility_CoerceValue)));
-
-        private static void VerticalScrollBarVisibility_ValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is HexaEditor ctrl)
-            {
-                Visibility value = (Visibility)e.NewValue;
-
-                switch (value)
-                {
-                    case Visibility.Visible:
-                        ctrl.VerticalScrollBar.Visibility = Visibility.Visible;
-                        break;
-
-                    case Visibility.Collapsed:
-                        ctrl.VerticalScrollBar.Visibility = Visibility.Collapsed;
-                        break;
-                }
-            }
-        }
-
+
         /// <summary>
         /// Set or Get value for change visibility of status bar
         /// </summary>
@@ -1801,11 +1766,11 @@ public void CloseProvider()
             UnSelectAll();
             RefreshView();
             UpdateHexHeader();
+            UpdateVerticalScroll();
         }
 
         /// <summary>
-        /// Save to the current stream
-        /// TODO: Add save as another stream...
+        /// Save to the current stream/file
         /// </summary>
         public void SubmitChanges()
         {
@@ -1816,7 +1781,6 @@ public void SubmitChanges()
 
         /// <summary>
         /// Save as to another file
-        /// TODO: Add save as another stream...
         /// </summary>
         public void SubmitChanges(string newfilename, bool overwrite = false)
         {

diff --git a/WPFHexaEditor.Control/WPFHexaEditor.csproj b/WPFHexaEditor.Control/WPFHexaEditor.csproj
@@ -46,9 +46,6 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -155,7 +152,6 @@
       <LastGenOutput>Resources.fr-CA.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -191,4 +187,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/WPFHexaEditor.Control/packages.config b/WPFHexaEditor.Control/packages.config
diff --git a/WPFHexaEditorExample/MainWindow.xaml b/WPFHexaEditorExample/MainWindow.xaml
@@ -98,14 +98,10 @@
                     <MenuItem x:Name="ShowHeaderMenu" Header="Header visibility" Click="ShowHeaderMenu_Click"
                               IsCheckable="True"
                               IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=HeaderVisibility, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-
-                    <MenuItem x:Name="ShowScrollMenu" Header="Scroll visibility" Click="ShowScrollMenu_Click"
-                              IsCheckable="True"
-                              IsChecked="{Binding Source={x:Static properties:Settings.Default}, Path=ScrollVisibility, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
                 </MenuItem>
             </Menu>
 
-            <Control:HexaEditor x:Name="HexEdit" Width="Auto" Height="Auto" Margin="2" AllowByteCount="False"/>
+            <Control:HexaEditor x:Name="HexEdit" Width="Auto" Height="Auto" Margin="2" AllowByteCount="False" />
         </DockPanel>
     </Grid>
 </Window>
diff --git a/WPFHexaEditorExample/MainWindow.xaml.cs b/WPFHexaEditorExample/MainWindow.xaml.cs
@@ -90,16 +90,6 @@ private void UpdateSetting(SettingEnum setting)
 
                     Settings.Default.HeaderVisibility = HexEdit.HeaderVisibility == Visibility.Visible;
                     break;
-
-                case SettingEnum.ScrollVisibility:
-                    if (!Settings.Default.ScrollVisibility)
-                        HexEdit.VerticalScrollBarVisibility = Visibility.Collapsed;
-                    else
-                        HexEdit.VerticalScrollBarVisibility = Visibility.Visible;
-
-                    Settings.Default.ScrollVisibility = HexEdit.VerticalScrollBarVisibility == Visibility.Visible;
-                    break;
-
                 case SettingEnum.ReadOnly:
                     HexEdit.ReadOnlyMode = Settings.Default.ReadOnly;