Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Commit

Permalink
* Build 633
Browse files Browse the repository at this point in the history
  • Loading branch information
@PWagner1
PWagner1 committed Jul 16, 2018
1 parent 36be1b2 commit c25458b
Show file tree
Hide file tree
Showing 404 changed files with 175,333 additions and 1,514 deletions.
86,825 changes: 86,825 additions & 0 deletions Binaries/Krypton Toolkit.xml
View file

Large diffs are not rendered by default.

86,825 changes: 86,825 additions & 0 deletions Binaries/Versions/4.70/Krypton Toolkit Examples/Krypton Toolkit.xml
View file

Large diffs are not rendered by default.

Binary file removed Installer Project Files/Krypton .NET 4.71/Krypton .NET 4.71-cache/cacheIndex.txt
View file
Binary file not shown.
Binary file removed ...ller Project Files/Krypton .NET 4.71/Krypton .NET 4.71-cache/part1/Krypton .NET 4.711.cab
View file
Binary file not shown.
Binary file removed Installer Project Files/Krypton .NET 4.71/Krypton .NET 4.71-cache/part1/output-info.ini
View file
Binary file not shown.
558 changes: 0 additions & 558 deletions Installer Project Files/Krypton .NET 4.71/Krypton .NET 4.71.aip
View file

This file was deleted.

564 changes: 564 additions & 0 deletions ...oject Files/Krypton Toolkit Suite for .NET 4.7.1/Krypton Toolkit Suite for .NET 4.7.1.aip
View file

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@

=======

## 2018-07-16 Build 633
* Build 633 (released Monday 16th July, 2018) is now available through the **releases** tab
* Fix KryptonForm does not respect Minimum Size set in designer #57
* And sort out some spelling mistakes in the `VisualForm.cs`
* `SeparatorController.cs` & `DragObject` bug fix, #79
* Fix for bug Issue, #79, courtesy of [James Simms](https://github.com/jwsimms)

=======

## 2018-06-15 Palette Example Application
* Now you can export your custom palette creation in the `Krypton Palette Example` application.

Expand Down
6 changes: 3 additions & 3 deletions Source/Krypton Components/ComponentFactory.Krypton.Design/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

using System.Reflection;

[assembly: AssemblyVersion("4.711.0.0")]
[assembly: AssemblyFileVersion("4.711.564.0")]
[assembly: AssemblyInformationalVersion("4.711.564.0")]
[assembly: AssemblyVersion("4.71.0.0")]
[assembly: AssemblyFileVersion("4.71.564.0")]
[assembly: AssemblyInformationalVersion("4.71.564.0")]
[assembly: AssemblyCopyright("© Component Factory Pty Ltd, 2006-2018. Then modifications by Peter Wagner (aka Wagnerp) & Simon Coghlan (aka Smurf-IV) 2017-2018. All rights reserved.")]
[assembly: AssemblyProduct("Krypton Design")]
[assembly: AssemblyDefaultAlias("ComponentFactory.Krypton.Design.dll")]
Expand Down
6 changes: 3 additions & 3 deletions Source/Krypton Components/ComponentFactory.Krypton.Docking/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
using System.Runtime.InteropServices;
using System.Security;

[assembly: AssemblyVersion("4.711.578.0")]
[assembly: AssemblyFileVersion("4.711.578.0")]
[assembly: AssemblyInformationalVersion("4.711.578.0")]
[assembly: AssemblyVersion("4.71.583.0")]
[assembly: AssemblyFileVersion("4.71.583.0")]
[assembly: AssemblyInformationalVersion("4.71.583.0")]
[assembly: AssemblyCopyright("© Component Factory Pty Ltd, 2006-2018. Then modifications by Peter Wagner (aka Wagnerp) & Simon Coghlan (aka Smurf-IV) 2017-2018. All rights reserved.")]
[assembly: AssemblyProduct("Krypton Docking")]
[assembly: AssemblyDefaultAlias("ComponentFactory.Krypton.Docking.dll")]
Expand Down
6 changes: 3 additions & 3 deletions Source/Krypton Components/ComponentFactory.Krypton.Navigator/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
using System.Runtime.InteropServices;
using System.Security;

[assembly: AssemblyVersion("4.711.578.0")]
[assembly: AssemblyFileVersion("4.711.578.0")]
[assembly: AssemblyInformationalVersion("4.711.578.0")]
[assembly: AssemblyVersion("4.71.582.0")]
[assembly: AssemblyFileVersion("4.71.582.0")]
[assembly: AssemblyInformationalVersion("4.71.582.0")]
[assembly: AssemblyCopyright("© Component Factory Pty Ltd, 2006-2018. Then modifications by Peter Wagner (aka Wagnerp) & Simon Coghlan (aka Smurf-IV) 2017-2018. All rights reserved.")]
[assembly: AssemblyProduct("Krypton Navigator")]
[assembly: AssemblyDefaultAlias("ComponentFactory.Krypton.Navigator.dll")]
Expand Down
6 changes: 3 additions & 3 deletions Source/Krypton Components/ComponentFactory.Krypton.Ribbon/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
using System.Runtime.InteropServices;
using System.Security;

[assembly: AssemblyVersion("4.711.579.0")]
[assembly: AssemblyFileVersion("4.711.579.0")]
[assembly: AssemblyInformationalVersion("4.711.579.0")]
[assembly: AssemblyVersion("4.71.583.0")]
[assembly: AssemblyFileVersion("4.71.583.0")]
[assembly: AssemblyInformationalVersion("4.71.583.0")]
[assembly: AssemblyCopyright("© Component Factory Pty Ltd, 2006-2018. Then modifications by Peter Wagner (aka Wagnerp) & Simon Coghlan (aka Smurf-IV) 2017-2018. All rights reserved.")]
[assembly: AssemblyProduct("Krypton Ribbon")]
[assembly: AssemblyDefaultAlias("ComponentFactory.Krypton.Ribbon.dll")]
Expand Down
107 changes: 60 additions & 47 deletions ...e/Krypton Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/KryptonComboBox.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
// Version 4.71.0.0 www.ComponentFactory.com
// *****************************************************************************

using Microsoft.Win32;
using System;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Design;
using System.ComponentModel;
using System.Windows.Forms;
using System.Runtime.InteropServices;
using Microsoft.Win32;
using System.Windows.Forms;

namespace ComponentFactory.Krypton.Toolkit
{
/// <summary>
/// <summary>
/// Provide a ComboBox with Krypton styling applied.
/// </summary>
[ToolboxItem(true)]
/// </summary>
[ToolboxItem(true)]
[ToolboxBitmap(typeof(KryptonComboBox), "ToolboxBitmaps.KryptonComboBox.bmp")]
[DefaultEvent("SelectedIndexChanged")]
[DefaultProperty("Text")]
[DefaultProperty("Text")]
[DefaultBindingProperty("Text")]
[LookupBindingProperties("DataSource", "DisplayMember", "ValueMember", "SelectedValue")]
[Designer(typeof(ComponentFactory.Krypton.Toolkit.KryptonComboBoxDesigner))]
Expand Down Expand Up @@ -159,7 +159,7 @@ public bool MouseOver
{
get => _mouseOver;

set
set
{
// Only interested in changes
if (_mouseOver != value)
Expand Down Expand Up @@ -418,7 +418,7 @@ protected override void WndProc(ref Message m)
stringFormat);
}
}
catch(ArgumentException)
catch (ArgumentException)
{
using (SolidBrush foreBrush = new SolidBrush(ForeColor))
{
Expand Down Expand Up @@ -505,7 +505,7 @@ private void DrawDropButton(Graphics g, Rectangle drawRect)
PaletteContentStyle.ButtonStandalone);

// Create view element for drawing the actual button
_viewButton = new ViewDrawButton(_palette, _palette, _palette,
_viewButton = new ViewDrawButton(_palette, _palette, _palette,
_palette, _palette, _palette, _palette,
new PaletteMetricRedirect(_kryptonComboBox.Redirector),
this, VisualOrientation.Top, false);
Expand Down Expand Up @@ -781,8 +781,8 @@ protected virtual void OnTrackMouseLeave(EventArgs e)
/// <summary>
/// Collection for managing ButtonSpecAny instances.
/// </summary>
public class ComboBoxButtonSpecCollection : ButtonSpecCollection<ButtonSpecAny>
{
public class ComboBoxButtonSpecCollection : ButtonSpecCollection<ButtonSpecAny>
{
#region Identity
/// <summary>
/// Initialize a new instance of the ComboBoxButtonSpecCollection class.
Expand Down Expand Up @@ -991,6 +991,13 @@ public ComboBoxButtonSpecCollection(KryptonComboBox owner)
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event EventHandler PaddingChanged;

/// <summary>
/// Occurs when [draw item].
/// </summary>
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public new event DrawItemEventHandler DrawItem;
#endregion

#region Identity
Expand Down Expand Up @@ -1149,7 +1156,7 @@ protected override void Dispose(bool disposing)
}
#endregion

#region Public
#region Public
/// <summary>
/// Signals the object that initialization is starting.
/// </summary>
Expand All @@ -1171,7 +1178,7 @@ public virtual void EndInit()
IsInitializing = false;

// Force calculation of the drop down items again so they are sized correctly
_comboBox.DrawMode = DrawMode.OwnerDrawVariable;
_comboBox.DrawMode = DrawMode.OwnerDrawVariable;

// Raise event to show control is now initialized
OnInitialized(EventArgs.Empty);
Expand Down Expand Up @@ -1361,10 +1368,10 @@ public override ContextMenuStrip ContextMenuStrip
{
get => base.ContextMenuStrip;

set
set
{
base.ContextMenuStrip = value;
_comboBox.ContextMenuStrip = value;
_comboBox.ContextMenuStrip = value;
}
}

Expand Down Expand Up @@ -1402,7 +1409,7 @@ public object DataSource
[Description("Indicates the property to display for the items in this control.")]
[TypeConverter("System.Windows.Forms.Design.DataMemberFieldConverter, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[Editor("System.Windows.Forms.Design.DataMemberFieldEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
[DefaultValue("")]
[DefaultValue("")]
public string DisplayMember
{
get => _comboBox.DisplayMember;
Expand Down Expand Up @@ -1494,7 +1501,7 @@ public ComboBoxStyle DropDownStyle
{
get => _comboBox.DropDownStyle;

set
set
{
if (_comboBox.DropDownStyle != value)
{
Expand Down Expand Up @@ -1546,9 +1553,9 @@ public int DropDownWidth
public int ItemHeight
{
get { return _comboBox.ItemHeight; }
set
{

set
{
// Do nothing, we set the ItemHeight internally to match the font
}
}
Expand Down Expand Up @@ -1816,32 +1823,32 @@ private bool ShouldSerializeStateCommon()
{
return !StateCommon.IsDefault;
}

/// <summary>
/// Gets access to the disabled combobox appearance entries.
/// </summary>
[Category("Visuals")]
/// </summary>
[Category("Visuals")]
[Description("Overrides for defining disabled combobox appearance.")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
public PaletteComboBoxStates StateDisabled { get; }

private bool ShouldSerializeStateDisabled()
{
return !StateDisabled.IsDefault;
}
{
return !StateDisabled.IsDefault;
}

/// <summary>
/// <summary>
/// Gets access to the normal combobox appearance entries.
/// </summary>
[Category("Visuals")]
/// </summary>
[Category("Visuals")]
[Description("Overrides for defining normal combobox appearance.")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
public PaletteComboBoxStates StateNormal { get; }

private bool ShouldSerializeStateNormal()
{
return !StateNormal.IsDefault;
}
{
return !StateNormal.IsDefault;
}

/// <summary>
/// Gets access to the active combobox appearance entries.
Expand Down Expand Up @@ -1981,7 +1988,7 @@ public void SetFixedState(bool active)
[EditorBrowsable(EditorBrowsableState.Never)]
public bool IsActive
{
get
get
{
if (_fixedActive != null)
{
Expand Down Expand Up @@ -2068,16 +2075,16 @@ public override Size GetPreferredSize(Size proposedSize)
/// Gets the rectangle that represents the display area of the control.
/// </summary>
public override Rectangle DisplayRectangle
{
get
{
{
get
{
// Ensure that the layout is calculated in order to know the remaining display space
ForceViewLayout();

// The inside combo box is the client rectangle size
return new Rectangle(_comboHolder.Location, _comboHolder.Size);
}
}
}
}

/// <summary>
/// Override the display padding for the layout fill.
Expand Down Expand Up @@ -2241,6 +2248,12 @@ protected void ForceControlLayout()
/// </summary>
/// <param name="e">An EventArgs containing the event data.</param>
protected virtual void OnTrackMouseLeave(EventArgs e) => TrackMouseLeave?.Invoke(this, e);

/// <summary>
/// Raises the <see cref="E:DrawItem" /> event.
/// </summary>
/// <param name="e">The <see cref="DrawItemEventArgs"/> instance containing the event data.</param>
protected virtual void OnDrawItem(DrawItemEventArgs e) => DrawItem?.Invoke(this, e);
#endregion

#region Protected Overrides
Expand Down Expand Up @@ -2278,7 +2291,7 @@ protected override void OnHandleCreated(EventArgs e)
/// </summary>
/// <param name="e">An EventArgs that contains the event data.</param>
protected override void OnEnabledChanged(EventArgs e)
{
{
// Ensure we have subclassed the contained edit control
UpdateEditControl();

Expand Down Expand Up @@ -2460,8 +2473,8 @@ protected override void OnLayout(LayoutEventArgs levent)
if (fillRect != _comboHolder.Bounds)
{
_comboHolder.SetBounds(fillRect.X, fillRect.Y, fillRect.Width, fillRect.Height);
_comboBox.SetBounds(-(1 + _layoutPadding.Left),
-(1 + _layoutPadding.Top),
_comboBox.SetBounds(-(1 + _layoutPadding.Left),
-(1 + _layoutPadding.Top),
fillRect.Width + 2 + _layoutPadding.Right,
fillRect.Height + 2 + _layoutPadding.Bottom);
}
Expand All @@ -2478,8 +2491,8 @@ protected override void OnLayout(LayoutEventArgs levent)
/// <param name="width">The new Width property value of the control.</param>
/// <param name="height">The new Height property value of the control.</param>
/// <param name="specified">A bitwise combination of the BoundsSpecified values.</param>
protected override void SetBoundsCore(int x, int y,
int width, int height,
protected override void SetBoundsCore(int x, int y,
int width, int height,
BoundsSpecified specified)
{
// If setting the actual height
Expand Down Expand Up @@ -2707,7 +2720,7 @@ private void OnComboBoxDrawItem(object sender, DrawItemEventArgs e)
e.Graphics.TextRenderingHint = CommonHelper.PaletteTextHintToRenderingHint(StateNormal.Item.PaletteContent.GetContentShortTextHint(PaletteState.Normal));

TextFormatFlags flags = TextFormatFlags.TextBoxControl | TextFormatFlags.NoPadding;

// Use the correct prefix setting
flags |= TextFormatFlags.NoPrefix;

Expand Down
4 changes: 3 additions & 1 deletion Source/Krypton Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/KryptonForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,9 @@ private CreateParams GetCreateParams()
return cp;
}

// Example by juverpp
/// <summary>
/// Example by juverpp
/// </summary>
protected override CreateParams CreateParams
{
get
Expand Down
2 changes: 1 addition & 1 deletion ...ce/Krypton Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/KryptonPalette.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace ComponentFactory.Krypton.Toolkit
[DefaultEvent("PalettePaint")]
[DefaultProperty("BasePaletteMode")]
[DesignerCategory("code")]
[Designer("ComponentFactory.Krypton.Toolkit.KryptonPaletteDesigner, ComponentFactory.Krypton.Design, Version=4.711.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Designer("ComponentFactory.Krypton.Toolkit.KryptonPaletteDesigner, ComponentFactory.Krypton.Design, Version=4.71.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Description("Customisable palette component.")]
[ClassInterface(ClassInterfaceType.AutoDispatch)]
[ComVisible(true)]
Expand Down
4 changes: 2 additions & 2 deletions ...e/Krypton Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/KryptonTreeView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ public bool HotTracking
[Category("Behavior")]
[Description("The default image index for nodes.")]
[Localizable(true)]
[TypeConverter("ComponentFactory.Krypton.Toolkit.NoneExcludedImageIndexConverter, ComponentFactory.Krypton.Design, Version=4.711.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[TypeConverter("ComponentFactory.Krypton.Toolkit.NoneExcludedImageIndexConverter, ComponentFactory.Krypton.Design, Version=4.71.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Editor("System.Windows.Forms.Design.ImageIndexEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
[RefreshProperties(RefreshProperties.Repaint)]
[RelatedImageList("ImageList")]
Expand Down Expand Up @@ -930,7 +930,7 @@ public bool Scrollable
[Category("Behavior")]
[Description("The default image index for selected nodes.")]
[Localizable(true)]
[TypeConverter("ComponentFactory.Krypton.Toolkit.NoneExcludedImageIndexConverter, ComponentFactory.Krypton.Design, Version=4.711.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[TypeConverter("ComponentFactory.Krypton.Toolkit.NoneExcludedImageIndexConverter, ComponentFactory.Krypton.Design, Version=4.71.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Editor("System.Windows.Forms.Design.ImageIndexEditor, System.Design, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof(UITypeEditor))]
[RelatedImageList("ImageList")]
[DefaultValue(-1)]
Expand Down
2 changes: 1 addition & 1 deletion ...n Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/Test/KryptonPaletteTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace ComponentFactory.Krypton.Toolkit.ControlsToolkit.Test
[DefaultEvent("PalettePaint")]
[DefaultProperty("BasePaletteMode")]
[DesignerCategory("code")]
[Designer("ComponentFactory.Krypton.Toolkit.KryptonPaletteDesigner, ComponentFactory.Krypton.Design, Version=4.711.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Designer("ComponentFactory.Krypton.Toolkit.KryptonPaletteDesigner, ComponentFactory.Krypton.Design, Version=4.71.0.0, Culture=neutral, PublicKeyToken=a87e673e9ecb6e8e")]
[Description("Customisable palette component.")]
[ClassInterface(ClassInterfaceType.AutoDispatch)]
[ComVisible(true)]
Expand Down
Loading

0 comments on commit c25458b

Please sign in to comment.