Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfb7e227

Browse files
committed
Fixed ChangesSubmited closed stream & Control_ByteModified default ByteEventArgs
When accessing the stream using ChangesSubmited event the stream was closed.The event Control_ByteModified would return a default ByteEventArgs instead of updating BytePositionInStream.This patch fixes both of these issues.
1 parent6301115 commitfb7e227

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

‎Sources/WPFHexaEditor/Core/Bytes/ByteProvider.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,10 @@ public void SubmitChanges()
403403

404404
_stream.Position=bm.Key;
405405
_stream.WriteByte(bm.Value.Byte.Value);
406+
407+
//Clear the edited bytes background colour.
408+
bm.Value.Action=ByteAction.Nothing;
409+
_byteModifiedDictionary.Remove(bm);
406410
}
407411

408412
#endregion

‎Sources/WPFHexaEditor/HexEditor.xaml.cs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1023,8 +1023,12 @@ private void Control_ByteModified(object sender, ByteEventArgs e)
10231023
if(_provider.ReadOnlyMode)return;
10241024

10251025
if(senderisIByteControlctrl)
1026+
{
10261027
ModifyByte(ctrl.Byte.Byte[e.Index],ctrl.BytePositionInStream+e.Index);
10271028

1029+
e.BytePositionInStream=ctrl.BytePositionInStream;
1030+
}
1031+
10281032
BytesModified?.Invoke(this,e);
10291033
}
10301034

@@ -2092,13 +2096,7 @@ private void ProviderStream_ChangesSubmited(object sender, EventArgs e)
20922096
//Refresh stream
20932097
if(!CheckIsOpen(_provider))return;
20942098

2095-
varstream=newMemoryStream();
2096-
2097-
_provider.Position=0;
2098-
_provider.Stream.CopyTo(stream);
2099-
2100-
CloseProvider();
2101-
OpenStream(stream);
2099+
RefreshView(true);
21022100

21032101
ChangesSubmited?.Invoke(this,newEventArgs());
21042102
}

‎Sources/WPFHexaEditor/WpfHexEditorCore.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<ProjectSdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net47;net48;net50-windows</TargetFrameworks>
4+
<TargetFrameworks>net48;net50-windows</TargetFrameworks>
5+
<!--<TargetFrameworks>net47;net48;net50-windows</TargetFrameworks>-->
56
<UseWPF>true</UseWPF>
67
<RootNamespace>WpfHexaEditor</RootNamespace>
78
<AssemblyName>WPFHexaEditor</AssemblyName>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp