Improvements Office2010 Black and first try Render Office 2013

Source/Krypton Components/ComponentFactory.Krypton.Design/ComponentFactory.Krypton.Design 2010.csproj

@@ -115,6 +115,7 @@
     <Compile Include="Ribbon\KryptonRibbonQATButtonCollectionEditor.cs" />
     <Compile Include="Ribbon\KryptonRibbonRecentDocCollectionEditor.cs" />
     <Compile Include="Ribbon\KryptonRibbonTabDesigner.cs" />
+    <Compile Include="Toolkit\KryptonDataGridViewDesigner.cs" />
     <Compile Include="Toolkit\KryptonTreeViewActionList.cs" />
     <Compile Include="Toolkit\KryptonTreeViewDesigner.cs" />
     <Compile Include="Toolkit\KryptonBorderEdgeActionList.cs" />

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/General/CalculatedValues.cs

@@ -85,6 +85,7 @@ public void Recalculate()
                         _groupHeightModifier = 0;
                         _groupsHeightModifier = 0;
                         break;
+                    case PaletteRibbonShape.Office2013:
                     case PaletteRibbonShape.Office2010:
                         _groupHeightModifier = -3;
                         _groupsHeightModifier = -3;

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/Palette/PaletteRedirectRibbonAeroOverride.cs

@@ -56,7 +56,7 @@ public override Color GetContentShortTextColor1(PaletteContentStyle style, Palet
             if ((style == PaletteContentStyle.ButtonButtonSpec) && (state == PaletteState.Normal))
             {
                 // If the ribbon is showing in office 2010 style and using glass
-                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
                     return LightBackground(base.GetContentShortTextColor1(style, state));
             }
 
@@ -75,7 +75,7 @@ public override Color GetContentShortTextColor2(PaletteContentStyle style, Palet
             if ((style == PaletteContentStyle.ButtonButtonSpec) && (state == PaletteState.Normal))
             {
                 // If the ribbon is showing in office 2010 style and using glass
-                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
                     return LightBackground(base.GetContentShortTextColor2(style, state));
             }
 
@@ -96,7 +96,7 @@ public override Color GetContentLongTextColor1(PaletteContentStyle style, Palett
             if ((style == PaletteContentStyle.ButtonButtonSpec) && (state == PaletteState.Normal))
             {
                 // If the ribbon is showing in office 2010 style and using glass
-                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
                     return LightBackground(base.GetContentLongTextColor1(style, state));
             }
 
@@ -115,7 +115,7 @@ public override Color GetContentLongTextColor2(PaletteContentStyle style, Palett
             if ((style == PaletteContentStyle.ButtonButtonSpec) && (state == PaletteState.Normal))
             {
                 // If the ribbon is showing in office 2010 style and using glass
-                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+                if (_ribbon.CaptionArea.DrawCaptionOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
                     return LightBackground(base.GetContentLongTextColor2(style, state));
             }
 

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonAppTab.cs

@@ -184,7 +184,14 @@ public Color GetImageTransparentColor(PaletteState state)
         /// <returns>Title string.</returns>
         public string GetShortText()
         {
-            return _ribbon.RibbonAppButton.AppButtonText;
+            if (_ribbon.RibbonShape ==  PaletteRibbonShape.Office2013)
+            {
+                return _ribbon.RibbonAppButton.AppButtonText.ToUpper();
+            }
+            else
+            {
+                return _ribbon.RibbonAppButton.AppButtonText;
+            }
         }
 
         /// <summary>

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonCaptionArea.cs

@@ -603,8 +603,9 @@ private void OnFormChromeCheck(object sender, EventArgs e)
                 }
 
                 _kryptonForm.AllowComposition = _ribbon.AllowFormIntegrate && !_ribbon.InDesignMode;
-
-                bool newAllowIconDisplay = (!_integrated || !_ribbon.RibbonAppButton.AppButtonVisible);
+
+                //TODO call this function when palette is changing
+                bool newAllowIconDisplay = (!_integrated || !_ribbon.RibbonAppButton.AppButtonVisible || (_ribbon.RibbonAppButton.AppButtonVisible && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013)));
                 if (_kryptonForm.AllowIconDisplay != newAllowIconDisplay)
                 {
                     _kryptonForm.AllowIconDisplay = newAllowIconDisplay;

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonContextTitle.cs

@@ -218,7 +218,7 @@ public override void Layout(ViewLayoutContext context)
             }
 
             // Office 2010 draws a shadow effect of the text
-            if (_ribbon.RibbonShape == PaletteRibbonShape.Office2010)
+            if (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013)
             {
                 Rectangle shadowTextRect1 = new Rectangle(_textRect.X - 1, _textRect.Y + 1, _textRect.Width, _textRect.Height);
                 Rectangle shadowTextRect2 = new Rectangle(_textRect.X + 1, _textRect.Y + 1, _textRect.Width, _textRect.Height);

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonGroupButton.cs

@@ -266,7 +266,7 @@ public void ResetGroupItemSize()
         /// <param name="context">Layout context.</param>
         public override Size GetPreferredSize(ViewLayoutContext context)
         {
-            bool drawNonTrackingAreas = (_ribbon.RibbonShape != PaletteRibbonShape.Office2010);
+            bool drawNonTrackingAreas = (_ribbon.RibbonShape != PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013);
 
             // Update the views with the type of button being used
             _viewLarge.ButtonType = _ribbonButton.ButtonType;

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonGroupColorButton.cs

@@ -266,7 +266,7 @@ public void ResetGroupItemSize()
         /// <param name="context">Layout context.</param>
         public override Size GetPreferredSize(ViewLayoutContext context)
         {
-            bool drawNonTrackingAreas = (_ribbon.RibbonShape != PaletteRibbonShape.Office2010);
+            bool drawNonTrackingAreas = (_ribbon.RibbonShape != PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013);
 
             // Update the views with the type of button being used
             _viewLarge.ButtonType = _ribbonColorButton.ButtonType;

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonGroupsBorder.cs

@@ -28,6 +28,8 @@ internal class ViewDrawRibbonGroupsBorder  : ViewComposite,
         #region Static Fields
         private static readonly Padding _borderPadding2007 = new Padding(3, 3, 3, 2);
         private static readonly Padding _borderPadding2010 = new Padding(1, 1, 1, 3);
+        //TODO checkseb
+        private static readonly Padding _borderPadding2013 = new Padding(1, 1, 1, 0);
         #endregion
 
         #region Instance Fields
@@ -106,6 +108,8 @@ public Padding BorderPadding
                         return _borderPadding2007;
                     case PaletteRibbonShape.Office2010:
                         return _borderPadding2010;
+                    case PaletteRibbonShape.Office2013 :
+                        return _borderPadding2013;
                 }
             }
         }

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonPanel.cs

@@ -51,8 +51,10 @@ internal class ViewDrawRibbonPanel : ViewDrawPanel
             _paintDelegate = paintDelegate;
 
             _compBlend = new Blend();
-            _compBlend.Positions = new float[] { 0.0f, 0.4f, 1.0f };
-            _compBlend.Factors = new float[] { 0.0f, 0.87f, 1.0f };
+            //_compBlend.Positions = new float[] { 0.0f, 0.4f, 1.0f };
+            //_compBlend.Factors = new float[] { 0.0f, 0.87f, 1.0f };
+            _compBlend.Positions = new float[] { 0.0f, 0.2f, 0.4f, 0.6f, 0.8f, 1.0f };
+            _compBlend.Factors = new float[] { 0.0f, 0.10f, 0.25f, 0.50f, 0.70f, 0.80f };
         }
         #endregion
 
@@ -65,14 +67,15 @@ public override void RenderBefore(RenderContext context)
         {
             // If we are rendering using desktop window composition and using the Office 2010 shape 
             // of ribbon then we need to draw the tabs area as part of the window chromw
-            if (DrawOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+            if (DrawOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
             {
                 int tabsHeight = _ribbon.TabsArea.ClientHeight;
 
                 // Clip to prevent drawing over the tabs area
                 using (Clipping clip = new Clipping(context.Graphics, new Rectangle(ClientLocation.X, ClientLocation.Y + tabsHeight, ClientWidth, ClientHeight - tabsHeight)))
                     base.RenderBefore(context);
 
+                //context.Graphics.DrawRectangle(new Pen(Color.Blue), new Rectangle(ClientLocation.X, ClientLocation.Y, ClientWidth, tabsHeight));
                 PaintRectangle(context.Graphics, new Rectangle(ClientLocation.X, ClientLocation.Y, ClientWidth, tabsHeight), true, null);
             }
             else
@@ -89,8 +92,9 @@ public override void RenderBefore(RenderContext context)
         public void PaintRectangle(Graphics g, Rectangle rect, bool edges, Control sender)
         {
             // If we are rendering using desktop window composition and using the Office 2010 shape 
-            // of ribbon then we need to draw the tabs area as part of the window chromw
-            if (DrawOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010))
+            // of ribbon then we need to draw the tabs area as part of the window chrome
+            // Not for 2013
+            if (DrawOnComposition && (_ribbon.RibbonShape == PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013))
             {
                 if (edges)
                 {
@@ -107,10 +111,31 @@ public void PaintRectangle(Graphics g, Rectangle rect, bool edges, Control sende
                     }
                 }
 
-                using (LinearGradientBrush backBrush = new LinearGradientBrush(new Rectangle(rect.X, rect.Y - 1, rect.Width, rect.Height + 1), Color.Transparent, Color.White, 90f))
+                if (_ribbon.RibbonShape == PaletteRibbonShape.Office2010)
+                {
+                    //Adjust Color of the gradient
+                    Color gradientColor;
+                    if (KryptonManager.CurrentGlobalPalette == KryptonManager.PaletteOffice2010Black)
+                    {
+                        gradientColor = Color.FromArgb(39, 39, 39);
+                    }
+                    else
+                    {
+                        gradientColor = Color.White;
+                    }
+
+                    using (LinearGradientBrush backBrush = new LinearGradientBrush(new Rectangle(rect.X, rect.Y - 1, rect.Width, rect.Height + 1), Color.Transparent, gradientColor, 90f))
+                    {
+                        backBrush.Blend = _compBlend;
+                        g.FillRectangle(backBrush, new Rectangle(rect.X, rect.Y, rect.Width, rect.Height - 1));
+                    }
+                }
+                else if (_ribbon.RibbonShape == PaletteRibbonShape.Office2013)
                 {
-                    backBrush.Blend = _compBlend;
-                    g.FillRectangle(backBrush, new Rectangle(rect.X, rect.Y, rect.Width, rect.Height - 1));
+                    using (SolidBrush backBrush = new SolidBrush(Color.White))
+                    {
+                        g.FillRectangle(backBrush, new Rectangle(rect.X, rect.Y, rect.Width, rect.Height - 1));
+                    }
                 }
             }
         }

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Draw/ViewDrawRibbonTab.cs

@@ -296,6 +296,8 @@ public Padding PreferredBorder
                         return _preferredBorder2007;
                     case PaletteRibbonShape.Office2010:
                         return _preferredBorder2010;
+                    case PaletteRibbonShape.Office2013:
+                        return _preferredBorder2010;
                 }
             }
         }
@@ -316,6 +318,8 @@ public Padding LayoutBorder
                         return _layoutBorder2007;
                     case PaletteRibbonShape.Office2010:
                         return _layoutBorder2010;
+                    case PaletteRibbonShape.Office2013:
+                        return _layoutBorder2010;
                 }
             }
         }
@@ -417,6 +421,7 @@ public override void RenderBefore(RenderContext context)
             switch (_ribbon.RibbonShape)
             {
                 default:
+                case PaletteRibbonShape.Office2013:
                 case PaletteRibbonShape.Office2007:
                     if (cts != null)
                         RenderBefore2007ContextTab(context, cts);
@@ -427,7 +432,8 @@ public override void RenderBefore(RenderContext context)
                     if (cts != null)
                         RenderBefore2010ContextTab(context, cts);
 
-                    _paletteContextCurrent.LightBackground = _ribbon.CaptionArea.DrawCaptionOnComposition;
+                    //_paletteContextCurrent.LightBackground = _ribbon.CaptionArea.DrawCaptionOnComposition;
+                    _paletteContextCurrent.LightBackground = _ribbon.CaptionArea.DrawCaptionOnComposition && (KryptonManager.CurrentGlobalPalette != KryptonManager.PaletteOffice2010Black);
                     break;
             }
 
@@ -489,7 +495,16 @@ public string GetShortText()
             // reference and the text is not zero length. We try and prevent
             // an empty string because it makes the tab useless!
             if ((_ribbonTab != null) && (_ribbonTab.Text.Length > 0))
-                return _ribbonTab.Text;
+            {
+                if (_ribbon.RibbonShape == PaletteRibbonShape.Office2013)
+                {
+                    return _ribbonTab.Text.ToUpper();
+                }
+                else
+                {
+                    return _ribbonTab.Text;
+                }
+            }
 
             return _empty;
         }

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Layout/ViewLayoutRibbonAppTab.cs

@@ -49,7 +49,7 @@ public ViewLayoutRibbonAppTab(KryptonRibbon ribbon)
         }
 
 		/// <summary>
-		/// Obtains the String representation of this instance.
+		/// Obtains t+he String representation of this instance.
 		/// </summary>
 		/// <returns>User readable name of the instance.</returns>
 		public override string ToString()

Source/Krypton Components/ComponentFactory.Krypton.Ribbon/View Layout/ViewLayoutRibbonTabsArea.cs

@@ -414,7 +414,7 @@ public void TestForAppButtonDoubleClick()
             if (elapsed.TotalMilliseconds < SystemInformation.DoubleClickTime)
             {
                 // Office 2010 does not close on a double click
-                if (_ribbon.RibbonShape != PaletteRibbonShape.Office2010)
+                if (_ribbon.RibbonShape != PaletteRibbonShape.Office2010 || _ribbon.RibbonShape == PaletteRibbonShape.Office2013)
                 {
                     // Close down the associated application window
                     Form ownerForm = _ribbon.FindForm();

Source/Krypton Components/ComponentFactory.Krypton.Toolkit/ComponentFactory.Krypton.Toolkit 2010.csproj

@@ -271,6 +271,16 @@
     <Compile Include="Palette Base\PaletteRedirect\PaletteRedirectBorderEdge.cs" />
     <Compile Include="Palette Base\PaletteRedirect\PaletteRedirectBorder.cs" />
     <Compile Include="Palette Base\PaletteElementColor\PaletteElementColor.cs" />
+    <Compile Include="Palette Builtin\PaletteOffice2013.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Palette Builtin\PaletteOffice2013Base.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Palette Builtin\PaletteOffice2013White.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Palette Controls\KryptonColorTable2013.cs" />
     <Compile Include="Palette Controls\PaletteBackInheritNode.cs" />
     <Compile Include="Palette Controls\PaletteContentInheritNode.cs" />
     <Compile Include="Palette Controls\PaletteNodeOverride.cs" />
@@ -410,6 +420,7 @@
     <Compile Include="Palette Controls\PaletteDataGridViewTripleCommon.cs" />
     <Compile Include="Palette Controls\PaletteDataGridViewTripleRedirect.cs" />
     <Compile Include="Palette Controls\PaletteColorButtonStrings.cs" />
+    <Compile Include="Rendering\KryptonOffice2013Renderer.cs" />
     <Compile Include="Rendering\RenderExpertHelpers.cs" />
     <Compile Include="Rendering\RenderOffice2007.cs">
       <SubType>Component</SubType>

Source/Krypton Components/ComponentFactory.Krypton.Toolkit/Controls Toolkit/KryptonManager.cs

@@ -57,10 +57,12 @@ public sealed class KryptonManager : Component
         private static PaletteSparkleBlue _paletteSparkleBlue;
         private static PaletteSparkleOrange _paletteSparkleOrange;
         private static PaletteSparklePurple _paletteSparklePurple;
+        private static PaletteOffice2013White _paletteOffice2013White;
         private static RenderStandard _renderStandard;
         private static RenderProfessional _renderProfessional;
         private static RenderOffice2007 _renderOffice2007;
         private static RenderOffice2010 _renderOffice2010;
+        private static RenderOffice2013 _renderOffice2013;
         private static RenderSparkle _renderSparkle;
         #endregion
 
@@ -435,6 +437,8 @@ public static IPalette CurrentGlobalPalette
                         return PaletteSparkleOrange;
                     case PaletteModeManager.SparklePurple:
                         return PaletteSparklePurple;
+                    case PaletteModeManager.Office2013White:
+                        return PaletteOffice2013White;
                     case PaletteModeManager.Custom:
                         return _globalPalette;
                     default:
@@ -475,6 +479,8 @@ public static IPalette GetPaletteForMode(PaletteMode mode)
                     return PaletteSparkleOrange;
                 case PaletteMode.SparklePurple:
                     return PaletteSparklePurple;
+                case PaletteMode.Office2013White:
+                    return PaletteOffice2013White;
                 case PaletteMode.Global:
                     return CurrentGlobalPalette;
                 case PaletteMode.Custom:
@@ -638,6 +644,20 @@ public static PaletteSparklePurple PaletteSparklePurple
             }
         }
 
+        /// <summary>
+        /// Gets the single instance of the Office 2013 palette.
+        /// </summary>
+        public static PaletteOffice2013White PaletteOffice2013White
+        {
+            get
+            {
+                if (_paletteOffice2013White == null)
+                    _paletteOffice2013White = new PaletteOffice2013White();
+
+                return _paletteOffice2013White;
+            }
+        }
+
         /// <summary>
         /// Gets the implementation for the requested renderer mode.
         /// </summary>
@@ -706,6 +726,20 @@ public static RenderOffice2010 RenderOffice2010
             }
         }
 
+        /// <summary>
+        /// Gets the single instance of the Office 2013 renderer.
+        /// </summary>
+        public static RenderOffice2013 RenderOffice2013
+        {
+            get
+            {
+                if (_renderOffice2013 == null)
+                    _renderOffice2013 = new RenderOffice2013();
+
+                return _renderOffice2013;
+            }
+        }
+
         /// <summary>
         /// Gets the single instance of the professional renderer.
         /// </summary>
@@ -832,6 +866,9 @@ private static void OnUserPreferenceChanged(object sender, UserPreferenceChanged
             if (_paletteSparklePurple != null)
                 _paletteSparklePurple.UserPreferenceChanged();
 
+            if (_paletteOffice2013White != null)
+                _paletteOffice2013White.UserPreferenceChanged();
+
             UpdateToolStripManager();
         }