Skip to content

Commit

Permalink
Merge pull request #2006 from giduac/1908-V95-KryptonDataGridViewDoma…
Browse files Browse the repository at this point in the history 
…inUpDownCell-updates

1908-V95-KryptonDataGridViewDateTimePickerCell-updates
  • Loading branch information
@PWagner1
PWagner1 authored Dec 27, 2024
2 parents b2b8958 + eb1e661 commit 7ce5df3
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 71 deletions.
137 changes: 69 additions & 68 deletions ...rypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
*
* New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
* Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2024. All rights reserved.
* Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2025. All rights reserved.
*
*/
#endregion
Expand All @@ -18,14 +18,10 @@ namespace Krypton.Toolkit
public class KryptonDataGridViewDomainUpDownCell : DataGridViewTextBoxCell
{
#region Static Fields
[ThreadStatic]
private static KryptonDomainUpDown _paintingDomainUpDown;

private const DataGridViewContentAlignment ANY_RIGHT = DataGridViewContentAlignment.TopRight | DataGridViewContentAlignment.MiddleRight | DataGridViewContentAlignment.BottomRight;
private const DataGridViewContentAlignment ANY_CENTER = DataGridViewContentAlignment.TopCenter | DataGridViewContentAlignment.MiddleCenter | DataGridViewContentAlignment.BottomCenter;
private static readonly Type _defaultEditType = typeof(KryptonDataGridViewDomainUpDownEditingControl);
private static readonly Type _defaultValueType = typeof(string);
private static readonly Size _sizeLarge = new Size(10000, 10000);
#endregion

#region Identity
Expand All @@ -34,14 +30,6 @@ public class KryptonDataGridViewDomainUpDownCell : DataGridViewTextBoxCell
/// </summary>
public KryptonDataGridViewDomainUpDownCell()
{
// Create a thread specific KryptonNumericUpDown control used for the painting of the non-edited cells
if (_paintingDomainUpDown == null)
{
_paintingDomainUpDown = new KryptonDomainUpDown();
_paintingDomainUpDown.SetLayoutDisplayPadding(new Padding(0, 0, 0, -1));
_paintingDomainUpDown.StateCommon.Border.Width = 0;
_paintingDomainUpDown.StateCommon.Border.Draw = InheritBool.False;
}
}

/// <summary>
Expand Down Expand Up @@ -78,14 +66,11 @@ public override void DetachEditingControl()

if (dataGridView.EditingControl is KryptonDomainUpDown domainUpDown)
{
if (OwningColumn is KryptonDataGridViewDomainUpDownColumn domainColumn)
{
domainUpDown.Items.Clear();
domainUpDown.Items.Clear();

if (domainUpDown.Controls[0].Controls[1] is TextBox textBox)
{
textBox.ClearUndo();
}
if (domainUpDown.Controls[0].Controls[1] is TextBox textBox)
{
textBox.ClearUndo();
}
}

Expand All @@ -107,41 +92,77 @@ public override void InitializeEditingControl(int rowIndex,
{
domainUpDown.Items.Clear();
domainUpDown.ButtonSpecs.Clear();
domainUpDown.ReadOnly = KryptonOwningColumn?.ReadOnlyItemsList ?? false;

if (OwningColumn is KryptonDataGridViewDomainUpDownColumn domainColumn)
if (KryptonOwningColumn is not null)
{
domainUpDown.Items.InsertRange(0, domainColumn.Items);
domainUpDown.Items.AddRange(KryptonOwningColumn.Items);
}

domainUpDown.Text = initialFormattedValue as string ?? string.Empty;
}
Debug.Print("InitializeEditingControl 5");
}

/// <summary>
/// Custom implementation of the PositionEditingControl method called by the DataGridView control when it
/// needs to relocate and/or resize the editing control.
/// </summary>
public override void PositionEditingControl(bool setLocation,
bool setSize,
Rectangle cellBounds,
Rectangle cellClip,
DataGridViewCellStyle cellStyle,
bool singleVerticalBorderAdded,
bool singleHorizontalBorderAdded,
bool isFirstDisplayedColumn,
bool isFirstDisplayedRow)
#endregion

#region Protected
protected override void Paint(Graphics graphics, Rectangle clipBounds, Rectangle cellBounds, int rowIndex, DataGridViewElementStates cellState, object? value,
object? formattedValue, string? errorText, DataGridViewCellStyle cellStyle, DataGridViewAdvancedBorderStyle advancedBorderStyle, DataGridViewPaintParts paintParts)
{
Rectangle editingControlBounds = PositionEditingPanel(cellBounds, cellClip, cellStyle,
singleVerticalBorderAdded, singleHorizontalBorderAdded,
isFirstDisplayedColumn, isFirstDisplayedRow);
if (DataGridView is not null
&& KryptonOwningColumn?.CellIndicatorImage is Image image)
{
int pos;
Rectangle textArea;
var righToLeft = DataGridView.RightToLeft == RightToLeft.Yes;

if (righToLeft)
{
pos = cellBounds.Left;

// The WinForms cell content always receives padding of one by default, custom padding is added tot that.
textArea = new Rectangle(
1 + cellBounds.Left + cellStyle.Padding.Left + image.Width,
1 + cellBounds.Top + cellStyle.Padding.Top,
cellBounds.Width - cellStyle.Padding.Left - cellStyle.Padding.Right - image.Width - 3,
cellBounds.Height - cellStyle.Padding.Top - cellStyle.Padding.Bottom - 2);
}
else
{
pos = cellBounds.Right - image.Width;

// The WinForms cell content always receives padding of one by default, custom padding is added tot that.
textArea = new Rectangle(
1 + cellBounds.Left + cellStyle.Padding.Left,
1 + cellBounds.Top + cellStyle.Padding.Top,
cellBounds.Width - cellStyle.Padding.Left - cellStyle.Padding.Right - image.Width - 3,
cellBounds.Height - cellStyle.Padding.Top - cellStyle.Padding.Bottom - 2);
}

// When the Krypton column is part of a WinForms DataGridView let the default paint routine paint the cell.
// Afterwards we paint the text and drop down image.
if (DataGridView is DataGridView)
{
base.Paint(graphics, clipBounds, cellBounds, rowIndex, cellState, null, string.Empty, errorText, cellStyle, advancedBorderStyle, paintParts);
}

editingControlBounds = GetAdjustedEditingControlBounds(editingControlBounds, cellStyle);
DataGridView!.EditingControl!.Location = new Point(editingControlBounds.X, editingControlBounds.Y);
DataGridView.EditingControl.Size = new Size(editingControlBounds.Width, editingControlBounds.Height);
// Draw the drop down button, only if no ErrorText has been set.
// If the ErrorText is set, only the error icon is shown. Otherwise both are painted on the same spot.
if (ErrorText.Length == 0)
{
graphics.DrawImage(image, new Point(pos, textArea.Top));
}
else
{
formattedValue = errorText;
}

TextRenderer.DrawText(graphics, formattedValue?.ToString() ?? string.Empty, cellStyle.Font, textArea, cellStyle.ForeColor,
KryptonDataGridViewUtilities.ComputeTextFormatFlagsForCellStyleAlignment(righToLeft, cellStyle.Alignment, cellStyle.WrapMode));
}
}
#endregion

#region Protected
/// <summary>
/// Customized implementation of the GetErrorIconBounds function in order to draw the potential
/// error icon next to the up/down buttons and not on top of them.
Expand Down Expand Up @@ -170,31 +191,6 @@ protected override Size GetPreferredSize(Graphics graphics, DataGridViewCellStyl
private KryptonDataGridViewDomainUpDownEditingControl EditingDomainUpDown => DataGridView!.EditingControl as KryptonDataGridViewDomainUpDownEditingControl
?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(DataGridView.EditingControl)));

private Rectangle GetAdjustedEditingControlBounds(Rectangle editingControlBounds,
DataGridViewCellStyle cellStyle)
{
// Adjust the vertical location of the editing control:
var preferredHeight = _paintingDomainUpDown.GetPreferredSize(_sizeLarge).Height + 2;
if (preferredHeight < editingControlBounds.Height)
{
switch (cellStyle.Alignment)
{
case DataGridViewContentAlignment.MiddleLeft:
case DataGridViewContentAlignment.MiddleCenter:
case DataGridViewContentAlignment.MiddleRight:
editingControlBounds.Y += (editingControlBounds.Height - preferredHeight) / 2;
break;
case DataGridViewContentAlignment.BottomLeft:
case DataGridViewContentAlignment.BottomCenter:
case DataGridViewContentAlignment.BottomRight:
editingControlBounds.Y += editingControlBounds.Height - preferredHeight;
break;
}
}

return editingControlBounds;
}

private void OnCommonChange()
{
if (DataGridView is { IsDisposed: false, Disposing: false })
Expand Down Expand Up @@ -230,6 +226,11 @@ internal static HorizontalAlignment TranslateAlignment(DataGridViewContentAlignm
return (align & ANY_CENTER) != 0 ? HorizontalAlignment.Center : HorizontalAlignment.Left;
}
}

/// <summary>
/// Type casted version of OwningColumn
/// </summary>
internal KryptonDataGridViewDomainUpDownColumn? KryptonOwningColumn => OwningColumn as KryptonDataGridViewDomainUpDownColumn;
#endregion
}
}
38 changes: 35 additions & 3 deletions ...pton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* © Component Factory Pty Ltd, 2006 - 2016, (Version 4.5.0.0) All rights reserved.
*
* New BSD 3-Clause License (https://github.com/Krypton-Suite/Standard-Toolkit/blob/master/LICENSE)
* Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2024. All rights reserved.
* Modifications by Peter Wagner (aka Wagnerp), Simon Coghlan (aka Smurf-IV), Giduac & Ahmed Abdelhameed et al. 2017 - 2025. All rights reserved.
*
*/
#endregion
Expand All @@ -19,13 +19,23 @@ namespace Krypton.Toolkit
[ToolboxBitmap(typeof(KryptonDataGridViewDomainUpDownColumn), "ToolboxBitmaps.KryptonDomainUpDown.bmp")]
public class KryptonDataGridViewDomainUpDownColumn : KryptonDataGridViewIconColumn
{
#region Fields
// Cell indicator image instance
private KryptonDataGridViewCellIndicatorImage _kryptonDataGridViewCellIndicatorImage;
#endregion

#region Identity
/// <summary>
/// Initialize a new instance of the KryptonDataGridViewDomainUpDownColumn class.
/// </summary>
public KryptonDataGridViewDomainUpDownColumn()
: base(new KryptonDataGridViewDomainUpDownCell()) =>
: base(new KryptonDataGridViewDomainUpDownCell())
{
Items = [];
_kryptonDataGridViewCellIndicatorImage = new();

ReadOnlyItemsList = false;
}

/// <summary>
/// Returns a standard compact string representation of the column.
Expand Down Expand Up @@ -59,6 +69,7 @@ public override object Clone()
}

cloned.Items.AddRange(strings);
cloned.ReadOnlyItemsList = ReadOnlyItemsList;

return cloned;
}
Expand Down Expand Up @@ -93,15 +104,36 @@ public override DataGridViewCell? CellTemplate
[Editor(@"System.Windows.Forms.Design.StringCollectionEditor", typeof(UITypeEditor))]
public StringCollection Items { get; }

[Category(@"Behavior")]
[Browsable(true)]
[Description(@"Forces the user to select a value from the domain list if enabled. If not the user can select a value from the list or enter text which will be saved tot the cell.")]
[DefaultValue(false)]
public bool ReadOnlyItemsList { get; set; }
#endregion

#region Private
/// <summary>
/// Small utility function that returns the template cell as a KryptonDataGridViewDomainUpDownCell
/// </summary>
private KryptonDataGridViewDomainUpDownCell DomainUpDownCellTemplate => CellTemplate as KryptonDataGridViewDomainUpDownCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(CellTemplate)));

#endregion

#region Internal
/// <summary>
/// Provides the cell indicator images to the cells from from this column instance.<br/>
/// For internal use only.
/// </summary>
internal Image? CellIndicatorImage => _kryptonDataGridViewCellIndicatorImage.Image;
#endregion Internal

#region Protected
/// <inheritdoc/>
protected override void OnDataGridViewChanged()
{
_kryptonDataGridViewCellIndicatorImage.DataGridView = DataGridView as KryptonDataGridView;
base.OnDataGridViewChanged();
}
#endregion Protected

}
}

0 comments on commit 7ce5df3

Please sign in to comment.