Skip to content
This repository has been archived by the owner on Jan 16, 2022. It is now read-only.

Commit

Permalink
* Build 555a
Browse files Browse the repository at this point in the history
  • Loading branch information
Wagnerp committed Mar 19, 2018
1 parent d232ff5 commit 2c528c8
Show file tree
Hide file tree
Showing 13 changed files with 143 additions and 140 deletions.
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@

=======

## 2018-03-19 Renderer class changes (Version 555a, build date 19th March, 2018)
* Changed some classes from `internal` to `public` for easeier accessibility for the **Extended Toolkit**

=======

## 2018-02-22 Toolkit build changes
* All AMD64/x64 solutions should now build into correct directories
* TODO: Rework Krypton Explorer (x64 and Any CPU) code to launch correct binaries
Expand Down
4 changes: 2 additions & 2 deletions ...res/Any CPU/Krypton Components/ComponentFactory.Krypton.Design/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("4.70.0.0")]
[assembly: AssemblyFileVersion("4.70.538.0")]
[assembly: AssemblyInformationalVersion("4.70.538.0")]
[assembly: AssemblyFileVersion("4.70.539.0")]
[assembly: AssemblyInformationalVersion("4.70.539.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 ...es/Any CPU/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.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("4.70.537.0")]
[assembly: AssemblyFileVersion("4.70.537.0")]
[assembly: AssemblyInformationalVersion("4.70.537.0")]
[assembly: AssemblyVersion("4.70.538.0")]
[assembly: AssemblyFileVersion("4.70.538.0")]
[assembly: AssemblyInformationalVersion("4.70.538.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 .../Any CPU/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.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("4.70.536.0")]
[assembly: AssemblyFileVersion("4.70.536.0")]
[assembly: AssemblyInformationalVersion("4.70.536.0")]
[assembly: AssemblyVersion("4.70.537.0")]
[assembly: AssemblyFileVersion("4.70.537.0")]
[assembly: AssemblyInformationalVersion("4.70.537.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 ...res/Any CPU/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.CompilerServices;
using System.Runtime.InteropServices;

[assembly: AssemblyVersion("4.70.536.0")]
[assembly: AssemblyFileVersion("4.70.536.0")]
[assembly: AssemblyInformationalVersion("4.70.536.0")]
[assembly: AssemblyVersion("4.70.537.0")]
[assembly: AssemblyFileVersion("4.70.537.0")]
[assembly: AssemblyInformationalVersion("4.70.537.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
8 changes: 4 additions & 4 deletions ...rypton Components/ComponentFactory.Krypton.Toolkit/Rendering/KryptonOffice2007Renderer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
// *****************************************************************************

using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Text;
using System.Drawing.Imaging;
using System.Drawing.Drawing2D;
using System.Collections.Generic;
using System.Drawing.Imaging;
using System.Drawing.Text;
using System.Windows.Forms;

namespace ComponentFactory.Krypton.Toolkit
{
internal class KryptonOffice2007Renderer : KryptonProfessionalRenderer
public class KryptonOffice2007Renderer : KryptonProfessionalRenderer
{
#region GradientItemColors
private class GradientItemColors
Expand Down
142 changes: 71 additions & 71 deletions ...rypton Components/ComponentFactory.Krypton.Toolkit/Rendering/KryptonOffice2010Renderer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
// *****************************************************************************

using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Text;
using System.Drawing.Imaging;
using System.Drawing.Drawing2D;
using System.Collections.Generic;
using System.Drawing.Imaging;
using System.Drawing.Text;
using System.Windows.Forms;

namespace ComponentFactory.Krypton.Toolkit
{
internal class KryptonOffice2010Renderer : KryptonProfessionalRenderer
public class KryptonOffice2010Renderer : KryptonProfessionalRenderer
{
#region GradientItemColors
private abstract class GradientItemColors
Expand Down Expand Up @@ -231,14 +231,14 @@ public override void DrawBack(Graphics g, Rectangle rect)
path2 = CreateBorderPath(rect2, CUT_ITEM_MENU),
path3 = CreateBorderPath(rect3, CUT_ITEM_MENU))
{
using(SolidBrush brush1 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.4f, Back1, 0.6f)),
using (SolidBrush brush1 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.4f, Back1, 0.6f)),
brush2 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.2f, Back1, 0.8f)),
brush3 = new SolidBrush(Back1))
{
g.FillPath(brush1, path1);
g.FillPath(brush2, path2);
g.FillPath(brush3, path3);
}
{
g.FillPath(brush1, path1);
g.FillPath(brush2, path2);
g.FillPath(brush3, path3);
}
}
}
}
Expand Down Expand Up @@ -451,7 +451,7 @@ protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
}
}
#endregion

#region OnRenderButtonBackground
/// <summary>
/// Raises the RenderButtonBackground event.
Expand Down Expand Up @@ -579,7 +579,7 @@ protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
/// <param name="e">A ToolStripItemTextRenderEventArgs that contains the event data.</param>
protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
{
if ((e.ToolStrip is ToolStrip) ||
if ((e.ToolStrip is ToolStrip) ||
(e.ToolStrip is ContextMenuStrip) ||
(e.ToolStrip is ToolStripDropDownMenu))
{
Expand Down Expand Up @@ -896,30 +896,30 @@ protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
}
break;
case StatusStrip _:
{
// Make sure the font is current
if (e.ToolStrip.Font != KCT.StatusStripFont)
{
e.ToolStrip.Font = KCT.StatusStripFont;
}
// Make sure the font is current
if (e.ToolStrip.Font != KCT.StatusStripFont)
{
e.ToolStrip.Font = KCT.StatusStripFont;
}

// We do not paint the top two pixel lines, as they are drawn by the status strip border render method
RectangleF backRect = new RectangleF(0, 1.5f, e.ToolStrip.Width, e.ToolStrip.Height - 2);
// We do not paint the top two pixel lines, as they are drawn by the status strip border render method
RectangleF backRect = new RectangleF(0, 1.5f, e.ToolStrip.Width, e.ToolStrip.Height - 2);

// Cannot paint a zero sized area
if ((backRect.Width > 0) && (backRect.Height > 0))
{
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.StatusStripGradientBegin,
KCT.StatusStripGradientEnd,
90f))
// Cannot paint a zero sized area
if ((backRect.Width > 0) && (backRect.Height > 0))
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.StatusStripGradientBegin,
KCT.StatusStripGradientEnd,
90f))
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
}
}
break;
}
break;
}
case MenuStrip _:
if (e.ToolStrip.Font != KCT.MenuStripFont)
{
Expand All @@ -929,57 +929,57 @@ protected override void OnRenderToolStripBackground(ToolStripRenderEventArgs e)
base.OnRenderToolStripBackground(e);
break;
default:
{
if (e.ToolStrip.Font != KCT.ToolStripFont)
{
e.ToolStrip.Font = KCT.ToolStripFont;
}
if (e.ToolStrip.Font != KCT.ToolStripFont)
{
e.ToolStrip.Font = KCT.ToolStripFont;
}

// Cannot paint a zero sized area
RectangleF backRect = new RectangleF(0, 0, e.ToolStrip.Width, e.ToolStrip.Height);
if ((backRect.Width > 0) && (backRect.Height > 0))
{
if (e.ToolStrip.Orientation == Orientation.Horizontal)
// Cannot paint a zero sized area
RectangleF backRect = new RectangleF(0, 0, e.ToolStrip.Width, e.ToolStrip.Height);
if ((backRect.Width > 0) && (backRect.Height > 0))
{
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.ToolStripGradientBegin,
KCT.ToolStripGradientEnd,
90f))
if (e.ToolStrip.Orientation == Orientation.Horizontal)
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
}
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.ToolStripGradientBegin,
KCT.ToolStripGradientEnd,
90f))
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
}

using (Pen darkBorder = new Pen(KCT.ToolStripBorder),
lightBorder = new Pen(KCT.ToolStripGradientBegin))
{
e.Graphics.DrawLine(lightBorder, 0, 2, 0, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(lightBorder, e.ToolStrip.Width - 2, 0, e.ToolStrip.Width - 2, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(darkBorder, e.ToolStrip.Width - 1, 0, e.ToolStrip.Width - 1, e.ToolStrip.Height - 1);
using (Pen darkBorder = new Pen(KCT.ToolStripBorder),
lightBorder = new Pen(KCT.ToolStripGradientBegin))
{
e.Graphics.DrawLine(lightBorder, 0, 2, 0, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(lightBorder, e.ToolStrip.Width - 2, 0, e.ToolStrip.Width - 2, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(darkBorder, e.ToolStrip.Width - 1, 0, e.ToolStrip.Width - 1, e.ToolStrip.Height - 1);
}
}
}
else
{
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.ToolStripGradientBegin,
KCT.ToolStripGradientEnd,
0f))
else
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
}
using (LinearGradientBrush backBrush = new LinearGradientBrush(backRect,
KCT.ToolStripGradientBegin,
KCT.ToolStripGradientEnd,
0f))
{
backBrush.Blend = _stripBlend;
e.Graphics.FillRectangle(backBrush, backRect);
}

using (Pen darkBorder = new Pen(KCT.ToolStripBorder),
lightBorder = new Pen(KCT.ToolStripGradientBegin))
{
e.Graphics.DrawLine(lightBorder, 1, 0, e.ToolStrip.Width - 2, 0);
e.Graphics.DrawLine(lightBorder, 1, e.ToolStrip.Height - 2, e.ToolStrip.Width - 2, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(darkBorder, e.ToolStrip.Width - 1, 0, e.ToolStrip.Width - 1, e.ToolStrip.Height - 1);
using (Pen darkBorder = new Pen(KCT.ToolStripBorder),
lightBorder = new Pen(KCT.ToolStripGradientBegin))
{
e.Graphics.DrawLine(lightBorder, 1, 0, e.ToolStrip.Width - 2, 0);
e.Graphics.DrawLine(lightBorder, 1, e.ToolStrip.Height - 2, e.ToolStrip.Width - 2, e.ToolStrip.Height - 2);
e.Graphics.DrawLine(darkBorder, e.ToolStrip.Width - 1, 0, e.ToolStrip.Width - 1, e.ToolStrip.Height - 1);
}
}
}
break;
}
break;
}
}
}
#endregion
Expand Down Expand Up @@ -1048,7 +1048,7 @@ protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
}
}
#endregion

#region OnRenderImageMargin
/// <summary>
/// Raises the RenderImageMargin event.
Expand Down
28 changes: 13 additions & 15 deletions ...rypton Components/ComponentFactory.Krypton.Toolkit/Rendering/KryptonOffice2013Renderer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@
// *****************************************************************************

using System;
using System.Text;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Text;
using System.Drawing.Imaging;
using System.Drawing.Drawing2D;
using System.Collections.Generic;
using System.Drawing.Imaging;
using System.Drawing.Text;
using System.Windows.Forms;
using System.Diagnostics;

namespace ComponentFactory.Krypton.Toolkit
{
internal class KryptonOffice2013Renderer : KryptonProfessionalRenderer
public class KryptonOffice2013Renderer : KryptonProfessionalRenderer
{
#region GradientItemColors
private abstract class GradientItemColors
Expand Down Expand Up @@ -232,14 +230,14 @@ public override void DrawBack(Graphics g, Rectangle rect)
path2 = CreateBorderPath(rect2, _cutItemMenu),
path3 = CreateBorderPath(rect3, _cutItemMenu))
{
using(SolidBrush brush1 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.4f, Back1, 0.6f)),
using (SolidBrush brush1 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.4f, Back1, 0.6f)),
brush2 = new SolidBrush(CommonHelper.MergeColors(Border1, 0.2f, Back1, 0.8f)),
brush3 = new SolidBrush(Back1))
{
g.FillPath(brush1, path1);
g.FillPath(brush2, path2);
g.FillPath(brush3, path3);
}
{
g.FillPath(brush1, path1);
g.FillPath(brush2, path2);
g.FillPath(brush3, path3);
}
}
}
}
Expand Down Expand Up @@ -451,7 +449,7 @@ protected override void OnRenderArrow(ToolStripArrowRenderEventArgs e)
}
}
#endregion

#region OnRenderButtonBackground
/// <summary>
/// Raises the RenderButtonBackground event.
Expand Down Expand Up @@ -580,7 +578,7 @@ protected override void OnRenderItemCheck(ToolStripItemImageRenderEventArgs e)
/// <param name="e">A ToolStripItemTextRenderEventArgs that contains the event data.</param>
protected override void OnRenderItemText(ToolStripItemTextRenderEventArgs e)
{
if ((e.ToolStrip is ToolStrip) ||
if ((e.ToolStrip is ToolStrip) ||
(e.ToolStrip is ContextMenuStrip) ||
(e.ToolStrip is ToolStripDropDownMenu))
{
Expand Down Expand Up @@ -1059,7 +1057,7 @@ protected override void OnRenderToolStripBorder(ToolStripRenderEventArgs e)
}
}
#endregion

#region OnRenderImageMargin
/// <summary>
/// Raises the RenderImageMargin event.
Expand Down
6 changes: 3 additions & 3 deletions ...pton Components/ComponentFactory.Krypton.Toolkit/Rendering/KryptonProfessionalRenderer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
// *****************************************************************************

using System;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using System.Windows.Forms;
using System.Reflection;
using System.Diagnostics;
using System.Windows.Forms;

namespace ComponentFactory.Krypton.Toolkit
{
internal class KryptonProfessionalRenderer : ToolStripProfessionalRenderer
public class KryptonProfessionalRenderer : ToolStripProfessionalRenderer
{
#region Instance Fields

Expand Down
Loading

0 comments on commit 2c528c8

Please sign in to comment.