From cf9a75c8e295590a1e8a26ed1a56f643fac8c4d7 Mon Sep 17 00:00:00 2001 From: Giduac Date: Wed, 25 Dec 2024 10:32:52 +0100 Subject: [PATCH] 1908-V100-KryptonDataGridViewDomainUpDownCell-updates Updates to the KryptonDataGridViewDomainUpDownColumn Change log entry will be provided when 1908 is fully completed --- .../KryptonDataGridViewDomainUpDownCell.cs | 135 +++++++++--------- .../KryptonDataGridViewDomainUpDownColumn.cs | 36 ++++- 2 files changed, 102 insertions(+), 69 deletions(-) diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs index b9be37a2c..b14dac121 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownCell.cs @@ -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 @@ -34,14 +30,6 @@ public class KryptonDataGridViewDomainUpDownCell : DataGridViewTextBoxCell /// 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; - } } /// @@ -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(); } } @@ -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"); } - /// - /// Custom implementation of the PositionEditingControl method called by the DataGridView control when it - /// needs to relocate and/or resize the editing control. - /// - 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 /// /// 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. @@ -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 }) @@ -230,6 +226,11 @@ internal static HorizontalAlignment TranslateAlignment(DataGridViewContentAlignm return (align & ANY_CENTER) != 0 ? HorizontalAlignment.Center : HorizontalAlignment.Left; } } + + /// + /// Type casted version of OwningColumn + /// + internal KryptonDataGridViewDomainUpDownColumn? KryptonOwningColumn => OwningColumn as KryptonDataGridViewDomainUpDownColumn; #endregion } } \ No newline at end of file diff --git a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs index be1e2f8ce..64d5cf88e 100644 --- a/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs +++ b/Source/Krypton Components/Krypton.Toolkit/Controls Toolkit/KryptonDataGridViewDomainUpDownColumn.cs @@ -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 /// /// Initialize a new instance of the KryptonDataGridViewDomainUpDownColumn class. /// public KryptonDataGridViewDomainUpDownColumn() - : base(new KryptonDataGridViewDomainUpDownCell()) => + : base(new KryptonDataGridViewDomainUpDownCell()) + { Items = []; + _kryptonDataGridViewCellIndicatorImage = new(); + + ReadOnlyItemsList = false; + } /// /// Returns a standard compact string representation of the column. @@ -59,6 +69,7 @@ public override object Clone() } cloned.Items.AddRange(strings); + cloned.ReadOnlyItemsList = ReadOnlyItemsList; return cloned; } @@ -93,6 +104,11 @@ 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 @@ -100,8 +116,24 @@ public override DataGridViewCell? CellTemplate /// Small utility function that returns the template cell as a KryptonDataGridViewDomainUpDownCell /// private KryptonDataGridViewDomainUpDownCell DomainUpDownCellTemplate => CellTemplate as KryptonDataGridViewDomainUpDownCell ?? throw new NullReferenceException(GlobalStaticValues.VariableCannotBeNull(nameof(CellTemplate))); - #endregion + #region Internal + /// + /// Provides the cell indicator images to the cells from from this column instance.
+ /// For internal use only. + /// + internal Image? CellIndicatorImage => _kryptonDataGridViewCellIndicatorImage.Image; + #endregion Internal + + #region Protected + /// + protected override void OnDataGridViewChanged() + { + _kryptonDataGridViewCellIndicatorImage.DataGridView = DataGridView as KryptonDataGridView; + base.OnDataGridViewChanged(); + } + #endregion Protected + } } \ No newline at end of file