fix Issue "ColumnType is disabled for Columns in EditColumns dialog"#10907
Merged
Epica3055 merged 3 commits intodotnet:mainfrom Feb 22, 2024
Merged
fix Issue "ColumnType is disabled for Columns in EditColumns dialog"#10907Epica3055 merged 3 commits intodotnet:mainfrom
Epica3055 merged 3 commits intodotnet:mainfrom
Conversation
Epica3055
force-pushed
the
Fix_Issue_10364
branch
from
cf4459b to
9e134b8
Compare
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
....Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.Picker.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.cs
Outdated
Show resolved
Hide resolved
|
|
||
| public override object EditValue(ITypeDescriptorContext? context, IServiceProvider provider, object? value) | ||
| { | ||
| if (provider is not null) |
Contributor
There was a problem hiding this comment.
Suggested change
| if (provider is not null) | |
| if (provider is null) | |
| { | |
| return value!; | |
| } |
Please review is nullability is defined correctly for EditValue return type. THis could be done in a follow up PR.
src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/DataGridViewColumnTypeEditor.cs
Outdated
Show resolved
Hide resolved
Contributor
|
Add a type forward for the new editor here -https://github.com/dotnet/winforms/blob/main/src/System.Design/src/System.Design.Forwards.cs |
Tanya-Solyanik
added
the
waiting-author-feedback
dotnet-policy-service
bot
removed
the
waiting-author-feedback
Epica3055
force-pushed
the
Fix_Issue_10364
branch
from
5f4bcae to
04b48b2
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #10907 +/- ##
===================================================
+ Coverage 73.15679% 73.16502% +0.00822%
===================================================
Files 3087 3093 +6
Lines 633665 633755 +90
Branches 47402 47416 +14
===================================================
+ Hits 463569 463687 +118
+ Misses 166587 166520 -67
- Partials 3509 3548 +39
Flags with carried forward coverage won't be shown. Click here to find out more. |
Tanya-Solyanik
added
the
ready-to-merge
lonitra
previously approved these changes
Feb 21, 2024
Member
lonitra
left a comment
lonitra
left a comment
There was a problem hiding this comment.
LGTM, added a couple minor comments, but this can be done in a follow up
| get | ||
| { | ||
| EditorAttribute editorAttr = new("Design.DataGridViewColumnTypeEditor, " + AssemblyRef.SystemDesign, typeof(System.Drawing.Design.UITypeEditor)); | ||
| EditorAttribute editorAttr = new("System.Windows.Forms.Design.DataGridViewColumnTypeEditor, " + AssemblyRef.SystemDesign, typeof(System.Drawing.Design.UITypeEditor)); |
Member
There was a problem hiding this comment.
Please use string interpolation:
Suggested change
| EditorAttribute editorAttr = new("System.Windows.Forms.Design.DataGridViewColumnTypeEditor, " + AssemblyRef.SystemDesign, typeof(System.Drawing.Design.UITypeEditor)); | |
| EditorAttribute editorAttr = new($"System.Windows.Forms.Design.DataGridViewColumnTypeEditor, {AssemblyRef.SystemDesign}", typeof(System.Drawing.Design.UITypeEditor)); |
Comment on lines
57
to
60
| private void CloseDropDown() | ||
| { | ||
| _windowsFormsEditorService?.CloseDropDown(); | ||
| } |
Member
There was a problem hiding this comment.
Suggested change
| private void CloseDropDown() | |
| { | |
| _windowsFormsEditorService?.CloseDropDown(); | |
| } | |
| private void CloseDropDown() => _windowsFormsEditorService?.CloseDropDown(); |
Epica3055
dismissed stale reviews from lonitra and Tanya-Solyanik
via
73cbc38
SimonZhao888
approved these changes
Feb 22, 2024
lonitra
approved these changes
Feb 22, 2024
dotnet-policy-service
bot
removed
the
ready-to-merge
KlausLoeffelmann
pushed a commit
to KlausLoeffelmann/winforms
that referenced
this pull request
Mar 5, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #10364
Proposed changes
Risk
Screenshots
Before
After
Test methodology
Test environment(s)
9.0.0-preview.2.24116.2
Microsoft Reviewers: Open in CodeFlow