Skip to content

Commit 24bd88f

Browse files
authored
Upstream Sync (#4)
2 parents a8cb3c4 + 984ec16 commit 24bd88f

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
- Initial GA Actions Support
1010
- Added New Target .NET 7.0
11+
- Fix TaskDialog.DefaultButton property is ignored
12+
- remove first dot in extension
1113

1214
### 2022-11-04
1315

source/WindowsAPICodePack/Core/Dialogs/TaskDialogs/TaskDialog.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,11 @@ private void ApplyControlConfiguration(NativeTaskDialogSettings settings)
815815
}
816816

817817
// Set default button and add elevation icons to appropriate buttons.
818-
settings.NativeConfiguration.defaultButtonIndex = FindDefaultButtonId(sourceList);
818+
var defaultBtn = FindDefaultButtonId(sourceList);
819+
if (defaultBtn != TaskDialogNativeMethods.NoDefaultButtonSpecified)
820+
{
821+
settings.NativeConfiguration.defaultButtonIndex = defaultBtn;
822+
}
819823

820824
ApplyElevatedIcons(settings, sourceList);
821825
}

source/WindowsAPICodePack/Shell/CommonFileDialogs/CommonFileDialogFilter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static string NormalizeExtension(string rawExtension)
128128
int indexOfDot = rawExtension.IndexOf('.');
129129
if (indexOfDot != -1)
130130
{
131-
rawExtension.Remove(indexOfDot);
131+
rawExtension = rawExtension.Substring(indexOfDot + 1);
132132
}
133133

134134
return rawExtension;

0 commit comments

Comments
 (0)