Skip to content

Commit a0553d7

Browse files
mmanelammanela
committed
Fix #154 
1 parent 3cb6415 commit a0553d7

2 files changed

Lines changed: 42 additions & 3 deletions

File tree

‎DiffPlex.Wpf/DiffPlex.Wpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\NuGet.props" />
33
<PropertyGroup>
44
<TargetFrameworks>net9.0-windows;net8.0-windows;net6.0-windows;net46;net48</TargetFrameworks>
@@ -41,7 +41,7 @@
4141
</EmbeddedResource>
4242
</ItemGroup>
4343

44-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0-windows' AND '$(TargetFramework)' != 'net6.0-windows' AND '$(TargetFramework)' != 'net46' AND '$(TargetFramework)' != 'net48'" >
44+
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0-windows' AND '$(TargetFramework)' != 'net8.0-windows' AND '$(TargetFramework)' != 'net6.0-windows' AND '$(TargetFramework)' != 'net46' AND '$(TargetFramework)' != 'net48'" >
4545
<Compile Remove="Forms\*.cs" />
4646
<EmbeddedResource Remove="Forms\*.resx" />
4747
</ItemGroup>

‎DiffPlex.Wpf/Forms/DiffViewer.cs‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using DiffPlex.DiffBuilder.Model;
1+
using DiffPlex.DiffBuilder.Model;
22
using System;
33
using System.Collections.Generic;
44
using System.ComponentModel;
@@ -75,6 +75,7 @@ public event DragStartedEventHandler SplitterDragStarted
7575
/// <summary>
7676
/// Gets or sets the open type weight or thickness of the specified font.
7777
/// </summary>
78+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
7879
public int FontWeight
7980
{
8081
get => Core.FontWeight.ToOpenTypeWeight();
@@ -84,6 +85,7 @@ public int FontWeight
8485
/// <summary>
8586
/// Gets or sets a value indicating whether the font is italic.
8687
/// </summary>
88+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
8789
public bool IsFontItalic
8890
{
8991
get => Core.FontStyle == System.Windows.FontStyles.Italic || Core.FontStyle == System.Windows.FontStyles.Oblique;
@@ -93,6 +95,7 @@ public bool IsFontItalic
9395
/// <summary>
9496
/// Gets or sets the degree to which a font is condensed or expanded on the screen.
9597
/// </summary>
98+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
9699
public System.Windows.FontStretch FontStretch
97100
{
98101
get => Core.FontStretch;
@@ -103,6 +106,7 @@ public System.Windows.FontStretch FontStretch
103106
/// <summary>
104107
/// Gets or sets the font size.
105108
/// </summary>
109+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
106110
public double FontSize
107111
{
108112
get => Core.FontSize;
@@ -112,6 +116,7 @@ public double FontSize
112116
/// <summary>
113117
/// Gets or sets the font family names.
114118
/// </summary>
119+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
115120
public string FontFamilyNames
116121
{
117122
get => Core.FontFamily?.Source ?? string.Empty;
@@ -121,6 +126,7 @@ public string FontFamilyNames
121126
/// <summary>
122127
/// Gets or sets the border width of a control.
123128
/// </summary>
129+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
124130
public Padding BorderWidth
125131
{
126132
get => ToPadding(Core.BorderThickness);
@@ -130,6 +136,7 @@ public Padding BorderWidth
130136
/// <summary>
131137
/// Gets or sets the border background color of a control.
132138
/// </summary>
139+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
133140
public Color BorderColor
134141
{
135142
get => GetColor(Core.Background);
@@ -139,6 +146,7 @@ public Color BorderColor
139146
/// <summary>
140147
/// Gets or sets the foreground color.
141148
/// </summary>
149+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
142150
public override Color ForeColor
143151
{
144152
get
@@ -156,6 +164,7 @@ public override Color ForeColor
156164
/// <summary>
157165
/// Gets or sets the background color.
158166
/// </summary>
167+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
159168
public override Color BackColor
160169
{
161170
get
@@ -173,6 +182,7 @@ public override Color BackColor
173182
/// <summary>
174183
/// Gets or sets the old text.
175184
/// </summary>
185+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
176186
public string OldText
177187
{
178188
get => Core.OldText;
@@ -182,6 +192,7 @@ public string OldText
182192
/// <summary>
183193
/// Gets or sets the new text.
184194
/// </summary>
195+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
185196
public string NewText
186197
{
187198
get => Core.NewText;
@@ -191,6 +202,7 @@ public string NewText
191202
/// <summary>
192203
/// Gets or sets a value indicating whether ignore the white space.
193204
/// </summary>
205+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
194206
public bool IgnoreWhiteSpace
195207
{
196208
get => Core.IgnoreWhiteSpace;
@@ -200,6 +212,7 @@ public bool IgnoreWhiteSpace
200212
/// <summary>
201213
/// Gets or sets a value indicating whether ignore case.
202214
/// </summary>
215+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
203216
public bool IgnoreCase
204217
{
205218
get => Core.IgnoreCase;
@@ -209,6 +222,7 @@ public bool IgnoreCase
209222
/// <summary>
210223
/// Gets or sets the foreground color of the line number.
211224
/// </summary>
225+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
212226
public Color LineNumberForeColor
213227
{
214228
get => GetColor(Core.LineNumberForeground);
@@ -218,6 +232,7 @@ public Color LineNumberForeColor
218232
/// <summary>
219233
/// Gets or sets the line number width.
220234
/// </summary>
235+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
221236
public int LineNumberWidth
222237
{
223238
get => Core.LineNumberWidth;
@@ -227,6 +242,7 @@ public int LineNumberWidth
227242
/// <summary>
228243
/// Gets or sets the foreground color of the change type symbol.
229244
/// </summary>
245+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
230246
public Color ChangeTypeForeColor
231247
{
232248
get => GetColor(Core.ChangeTypeForeground);
@@ -236,6 +252,7 @@ public Color ChangeTypeForeColor
236252
/// <summary>
237253
/// Gets or sets the header of the old text.
238254
/// </summary>
255+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
239256
public string OldTextHeader
240257
{
241258
get => Core.OldTextHeader;
@@ -245,6 +262,7 @@ public string OldTextHeader
245262
/// <summary>
246263
/// Gets or sets the header of the new text.
247264
/// </summary>
265+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
248266
public string NewTextHeader
249267
{
250268
get => Core.NewTextHeader;
@@ -254,6 +272,7 @@ public string NewTextHeader
254272
/// <summary>
255273
/// Gets or sets the foreground color of the line added.
256274
/// </summary>
275+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
257276
public double HeaderHeight
258277
{
259278
get => Core.HeaderHeight;
@@ -263,6 +282,7 @@ public double HeaderHeight
263282
/// <summary>
264283
/// Gets or sets the foreground color of the line added.
265284
/// </summary>
285+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
266286
public Color HeaderForeColor
267287
{
268288
get => GetColor(Core.HeaderForeground);
@@ -272,6 +292,7 @@ public Color HeaderForeColor
272292
/// <summary>
273293
/// Gets or sets the background color of the line added.
274294
/// </summary>
295+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
275296
public Color HeaderBackColor
276297
{
277298
get => GetColor(Core.HeaderBackground);
@@ -281,6 +302,7 @@ public Color HeaderBackColor
281302
/// <summary>
282303
/// Gets or sets the foreground color of the line added.
283304
/// </summary>
305+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
284306
public Color InsertedForeColor
285307
{
286308
get => GetColor(Core.InsertedForeground);
@@ -290,6 +312,7 @@ public Color InsertedForeColor
290312
/// <summary>
291313
/// Gets or sets the background color of the line added.
292314
/// </summary>
315+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
293316
public Color InsertedBackColor
294317
{
295318
get => GetColor(Core.InsertedBackground);
@@ -299,6 +322,7 @@ public Color InsertedBackColor
299322
/// <summary>
300323
/// Gets or sets the foreground color of the line deleted.
301324
/// </summary>
325+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
302326
public Color DeletedForeColor
303327
{
304328
get => GetColor(Core.DeletedForeground);
@@ -308,6 +332,7 @@ public Color DeletedForeColor
308332
/// <summary>
309333
/// Gets or sets the background color of the line deleted.
310334
/// </summary>
335+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
311336
public Color DeletedBackColor
312337
{
313338
get => GetColor(Core.DeletedBackground);
@@ -317,6 +342,7 @@ public Color DeletedBackColor
317342
/// <summary>
318343
/// Gets or sets the foreground color of the line unchanged.
319344
/// </summary>
345+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
320346
public Color UnchangedForeColor
321347
{
322348
get => GetColor(Core.UnchangedForeground);
@@ -326,6 +352,7 @@ public Color UnchangedForeColor
326352
/// <summary>
327353
/// Gets or sets the background color of the line unchanged.
328354
/// </summary>
355+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
329356
public Color UnchangedBackColor
330357
{
331358
get => GetColor(Core.UnchangedBackground);
@@ -335,6 +362,7 @@ public Color UnchangedBackColor
335362
/// <summary>
336363
/// Gets or sets the background color of the line imaginary.
337364
/// </summary>
365+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
338366
public Color ImaginaryBackColor
339367
{
340368
get => GetColor(Core.ImaginaryBackground);
@@ -344,6 +372,7 @@ public Color ImaginaryBackColor
344372
/// <summary>
345373
/// Gets or sets the background color of the grid splitter.
346374
/// </summary>
375+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
347376
public Color SplitterBackColor
348377
{
349378
get => GetColor(Core.SplitterBackground);
@@ -353,6 +382,7 @@ public Color SplitterBackColor
353382
/// <summary>
354383
/// Gets or sets the border color of the grid splitter.
355384
/// </summary>
385+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
356386
public Color SplitterBorderColor
357387
{
358388
get => GetColor(Core.SplitterBorderBrush);
@@ -362,6 +392,7 @@ public Color SplitterBorderColor
362392
/// <summary>
363393
/// Gets or sets the border width of the grid splitter.
364394
/// </summary>
395+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
365396
public Padding SplitterBorderWidth
366397
{
367398
get => ToPadding(Core.SplitterBorderThickness);
@@ -371,6 +402,7 @@ public Padding SplitterBorderWidth
371402
/// <summary>
372403
/// Gets or sets the width of the grid splitter.
373404
/// </summary>
405+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
374406
public double SplitterWidth
375407
{
376408
get => Core.SplitterWidth;
@@ -380,6 +412,7 @@ public double SplitterWidth
380412
/// <summary>
381413
/// Gets or sets a value indicating whether it is in side-by-side (split) view mode to diff.
382414
/// </summary>
415+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
383416
public bool IsSideBySide
384417
{
385418
get => Core.IsSideBySide;
@@ -389,6 +422,7 @@ public bool IsSideBySide
389422
/// <summary>
390423
/// Gets or sets a value indicating whether need collapse unchanged sections.
391424
/// </summary>
425+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
392426
public bool IgnoreUnchanged
393427
{
394428
get => Core.IgnoreUnchanged;
@@ -399,6 +433,7 @@ public bool IgnoreUnchanged
399433
/// Gets or sets the count of context line.
400434
/// The context line is the one unchanged arround others as their margin.
401435
/// </summary>
436+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
402437
public int LinesContext
403438
{
404439
get => Core.LinesContext;
@@ -408,6 +443,7 @@ public int LinesContext
408443
/// <summary>
409444
/// Gets or sets the display name of inline mode toggle.
410445
/// </summary>
446+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
411447
public object InlineModeToggleTitle
412448
{
413449
get => Core.InlineModeToggleTitle;
@@ -417,6 +453,7 @@ public object InlineModeToggleTitle
417453
/// <summary>
418454
/// Gets or sets the display name of side by side mode toggle.
419455
/// </summary>
456+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
420457
public object SideBySideModeToggleTitle
421458
{
422459
get => Core.SideBySideModeToggleTitle;
@@ -426,6 +463,7 @@ public object SideBySideModeToggleTitle
426463
/// <summary>
427464
/// Gets or sets the display name of skip unchanged lines toggle.
428465
/// </summary>
466+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
429467
public object CollapseUnchangedSectionsToggleTitle
430468
{
431469
get => Core.CollapseUnchangedSectionsToggleTitle;
@@ -435,6 +473,7 @@ public object CollapseUnchangedSectionsToggleTitle
435473
/// <summary>
436474
/// Gets or sets the display name of context lines count.
437475
/// </summary>
476+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
438477
public object ContextLinesMenuItemsTitle
439478
{
440479
get => Core.ContextLinesMenuItemsTitle;

0 commit comments

Comments
 (0)