Updated to handle VS themes

msawczyn · Jan 24, 2022 · ffb4465 · ffb4465
1 parent 58c6646
commit ffb4465
Show file tree

Hide file tree

Showing 71 changed files with 2,554 additions and 310 deletions.
diff --git a/src/Dsl/CustomCode/Extensions/ColorExtensions.cs b/src/Dsl/CustomCode/Extensions/ColorExtensions.cs
@@ -12,16 +12,24 @@ public static class ColorExtensions
       /// </summary>
       /// <param name="color">The background color</param>
       public static Color LegibleTextColor(this Color color)
+      {
+         return color.IsLight() ? Color.Black : Color.White;
+      }
+
+      public static bool IsDark(this Color color)
       {
          // Counting the perceptive luminance - human eye favors green color... 
          double a = 1 - (0.299 * color.R + 0.587 * color.G + 0.114 * color.B) / 255;
 
-         // bright colors (a < 0.5) - black font
-         // dark colors (a >= 0.5) - white font
+         // bright colors (a < 0.5)
+         // dark colors (a >= 0.5)
 
-         return a < 0.5
-                   ? Color.Black
-                   : Color.White;
+         return a >= 0.5;
+      }
+
+      public static bool IsLight(this Color color)
+      {
+         return !color.IsDark();
       }
    }
 }
diff --git a/src/Dsl/CustomCode/ModelElement Interfaces/IHasStore.cs b/src/Dsl/CustomCode/ModelElement Interfaces/IHasStore.cs
@@ -1,6 +1,4 @@
-// 
-
-using Microsoft.VisualStudio.Modeling;
+using Microsoft.VisualStudio.Modeling;
 
 namespace Sawczyn.EFDesigner.EFModel {
    public interface IHasStore

diff --git a/src/Dsl/CustomCode/ModelElement Interfaces/IThemeable.cs b/src/Dsl/CustomCode/ModelElement Interfaces/IThemeable.cs
@@ -0,0 +1,7 @@
+namespace Sawczyn.EFDesigner.EFModel
+{
+   public interface IThemeable
+   {
+      void SetThemeColors(DiagramThemeColors diagramColors);
+   }
+}
diff --git a/src/Dsl/CustomCode/Partials/AssociationConnector.cs b/src/Dsl/CustomCode/Partials/AssociationConnector.cs
@@ -1,9 +1,33 @@
-using Microsoft.VisualStudio.Modeling.Diagrams;
+using Microsoft.VisualStudio.Modeling;
+using Microsoft.VisualStudio.Modeling.Diagrams;
 
 namespace Sawczyn.EFDesigner.EFModel
 {
-   public abstract partial class AssociationConnector : IHasStore
+   public abstract partial class AssociationConnector : IHasStore, IThemeable
    {
+      /// <summary>
+      /// This method is called when a shape is inititially created, derived classes can
+      /// override to perform shape instance initialization.  This method is always called within a transaction.
+      /// </summary>
+      public override void OnInitialize()
+      {
+         base.OnInitialize();
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
+
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         using (Transaction tx = Store.TransactionManager.BeginTransaction("Set diagram colors"))
+         {
+            Color = diagramColors.Background.LegibleTextColor();
+            TextColor = diagramColors.Text;
+            Invalidate();
+
+            tx.Commit();
+         }
+      }
+
       /// <summary>
       /// Initializes style set resources for this shape type
       /// </summary>

diff --git a/src/Dsl/CustomCode/Partials/ClassShape.cs b/src/Dsl/CustomCode/Partials/ClassShape.cs
diff --git a/src/Dsl/CustomCode/Partials/CommentBoxShape.cs b/src/Dsl/CustomCode/Partials/CommentBoxShape.cs
@@ -2,10 +2,35 @@
 using System.Collections.Generic;
 using System.Drawing;
 
+using Microsoft.VisualStudio.Modeling;
+
 namespace Sawczyn.EFDesigner.EFModel
 {
-   public partial class CommentBoxShape: IHasStore
+   public partial class CommentBoxShape: IHasStore, IThemeable
    {
+      /// <summary>
+      /// Shape instance initialization.
+      /// </summary>
+      public override void OnInitialize()
+      {
+         base.OnInitialize();
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
+
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         using (Transaction tx = Store.TransactionManager.BeginTransaction("Set diagram colors"))
+         {
+            FillColor = diagramColors.Background;
+            TextColor = FillColor.LegibleTextColor();
+
+            Invalidate();
+
+            tx.Commit();
+         }
+      }
+
       //Called once for each shape instance. 
       protected override void InitializeDecorators(IList<ShapeField> shapeFields, IList<Decorator> decorators)
       {

diff --git a/src/Dsl/CustomCode/Partials/CommentConnector.cs b/src/Dsl/CustomCode/Partials/CommentConnector.cs
@@ -1,9 +1,34 @@
-using Microsoft.VisualStudio.Modeling.Diagrams;
+using Microsoft.VisualStudio.Modeling;
+using Microsoft.VisualStudio.Modeling.Diagrams;
 
 namespace Sawczyn.EFDesigner.EFModel
 {
-   public partial class CommentConnector: IHasStore
+   public partial class CommentConnector: IHasStore, IThemeable
    {
+      /// <summary>
+      /// This method is called when a shape is inititially created, derived classes can
+      /// override to perform shape instance initialization.  This method is always called within a transaction.
+      /// </summary>
+      public override void OnInitialize()
+      {
+         base.OnInitialize();
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
+
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         using (Transaction tx = Store.TransactionManager.BeginTransaction("Set diagram colors"))
+         {
+            Color = diagramColors.Background.LegibleTextColor();
+            TextColor = diagramColors.Text;
+
+            Invalidate();
+
+            tx.Commit();
+         }
+      }
+
       protected override int ModifyLuminosity(int currentLuminosity, DiagramClientView view)
       {
          if (!view.HighlightedShapes.Contains(new DiagramItem(this)))

diff --git a/src/Dsl/CustomCode/Partials/EFModelDiagram.cs b/src/Dsl/CustomCode/Partials/EFModelDiagram.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
@@ -14,7 +13,7 @@
 
 namespace Sawczyn.EFDesigner.EFModel
 {
-   public partial class EFModelDiagram : IHasStore
+   public partial class EFModelDiagram : IHasStore, IThemeable
    {
       public override void OnInitialize()
       {
@@ -30,6 +29,32 @@ public override void OnInitialize()
          ShowGrid = modelRoot?.ShowGrid ?? true;
          GridColor = modelRoot?.GridColor ?? Color.Gainsboro;
          SnapToGrid = modelRoot?.SnapToGrid ?? true;
+
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
+
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         Transaction tx = Store.TransactionManager.InTransaction
+                             ? null
+                             : Store.TransactionManager.BeginTransaction("Set diagram colors");
+
+         try
+         {
+            FillColor = diagramColors.Background;
+            TextColor = diagramColors.Text;
+
+            Invalidate();
+         }
+         finally
+         {
+            if (tx != null)
+            {
+               tx.Commit();
+               tx.Dispose();
+            }
+         }
       }
 
       /// <summary>
@@ -84,25 +109,22 @@ public void Unhighlight(ShapeElement shape)
       public override void OnDragOver(DiagramDragEventArgs diagramDragEventArgs)
       {
          base.OnDragOver(diagramDragEventArgs);
-
-         if (diagramDragEventArgs.Handled)
-            return;
+         diagramDragEventArgs.Handled = false;
 
          List<BidirectionalConnector> bidirectionalConnectorsUnderShape = ClassShape.ClassShapeDragData?.GetBidirectionalConnectorsUnderShape(diagramDragEventArgs.MousePosition);
-
-         foreach (BidirectionalConnector connector in bidirectionalConnectorsUnderShape)
-            Highlight(connector);
-
          bool isDroppingAssociationClass = bidirectionalConnectorsUnderShape?.Any() == true;
 
          if (isDroppingAssociationClass)
-            diagramDragEventArgs.Effect = DragDropEffects.Link;
+         {
+            foreach (BidirectionalConnector connector in bidirectionalConnectorsUnderShape)
+               Highlight(connector);
+
+            diagramDragEventArgs.Effect = DragDropEffects.Copy;
+         }
          else if (diagramDragEventArgs.Data.GetData("Sawczyn.EFDesigner.EFModel.ModelEnum") is ModelEnum
-          || diagramDragEventArgs.Data.GetData("Sawczyn.EFDesigner.EFModel.ModelClass") is ModelClass
-          || IsAcceptableDropItem(diagramDragEventArgs))
+               || diagramDragEventArgs.Data.GetData("Sawczyn.EFDesigner.EFModel.ModelClass") is ModelClass
+               || IsAcceptableDropItem(diagramDragEventArgs))
             diagramDragEventArgs.Effect = DragDropEffects.Copy;
-         else
-            diagramDragEventArgs.Effect = DragDropEffects.None;
 
          diagramDragEventArgs.Handled = true;
       }
@@ -380,5 +402,5 @@ public override void OnMouseDown(DiagramMouseEventArgs e)
       }
 
       public PointD MouseDownPosition;
-   }
+  }
 }
diff --git a/src/Dsl/CustomCode/Partials/EnumShape.cs b/src/Dsl/CustomCode/Partials/EnumShape.cs
@@ -12,8 +12,48 @@ namespace Sawczyn.EFDesigner.EFModel
    ///    Override some methods of the compartment shape.
    ///    *** GenerateDoubleDerived must be set for this shape in DslDefinition.dsl. ****
    /// </summary>
-   public partial class EnumShape : IHighlightFromModelExplorer, ICompartmentShapeMouseTarget
+   public partial class EnumShape : IHighlightFromModelExplorer, ICompartmentShapeMouseTarget, IThemeable
    {
+      /// <summary>
+      /// Shape instance initialization.
+      /// </summary>
+      public override void OnInitialize()
+      {
+         base.OnInitialize();
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
+
+      private static bool UseInverseGlyphs
+      {
+         get
+         {
+            return ModelDisplay.GetDiagramColors?.Invoke().Background.IsDark() ?? false;
+         }
+      }
+
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         using (Transaction tx = Store.TransactionManager.BeginTransaction("Set diagram colors"))
+         {
+            TextColor = diagramColors.Text;
+            FillColor = diagramColors.Background;
+
+            foreach (ListCompartment compartment in NestedChildShapes.OfType<ListCompartment>())
+            {
+               compartment.CompartmentFillColor = diagramColors.Background;
+               compartment.ItemTextColor = diagramColors.Text;
+               compartment.TitleFillColor = diagramColors.HeaderBackground;
+               compartment.TitleTextColor = diagramColors.HeaderText;
+
+               compartment.Invalidate();
+            }
+
+            Invalidate();
+            tx.Commit();
+         }
+      }
+
       /// <summary>
       /// Exposes NodeShape Collapse() function to DSL's context menu
       /// </summary>
@@ -36,22 +76,35 @@ protected override CompartmentMapping[] GetCompartmentMappings(Type melType)
       {
          CompartmentMapping[] mappings = base.GetCompartmentMappings(melType);
 
-         // Each item in the ValuesCompartment will call GetValueImage to determine its icon. Called any time the element's presentation element invalidates.
-         foreach (ElementListCompartmentMapping mapping in mappings.OfType<ElementListCompartmentMapping>()
-                                                                   .Where(m => m.CompartmentId == "ValuesCompartment"))
-            mapping.ImageGetter = GetValueImage;
+         // Each item in the ValuesCompartment will call GetValueGlyph to determine its icon. Called any time the element's presentation element invalidates.
+         foreach (ElementListCompartmentMapping mapping in mappings.OfType<ElementListCompartmentMapping>().Where(m => m.CompartmentId == "ValuesCompartment"))
+            mapping.ImageGetter = GetValueGlyph;
+
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
 
          return mappings;
       }
 
-      private Image GetValueImage(ModelElement element)
+      public static string GetExplorerNodeGlyphName(ModelEnum modelEnum)
+      {
+         string result = (modelEnum.IsVisible() ? nameof(Resources.Enumerator_16xVisible) : nameof(Resources.Enumerator_16x));
+
+         return UseInverseGlyphs
+                   ? result + "_i"
+                   : result;
+      }
+
+      private Image GetValueGlyph(ModelElement element)
       {
          ModelRoot modelRoot = element.Store.ModelRoot();
          if (element is ModelEnumValue enumValue)
          {
+            Color background = ModelDisplay.GetDiagramColors?.Invoke().Background ?? Color.White;
+
             return modelRoot.ShowWarningsInDesigner && enumValue.GetHasWarningValue()
-                      ? Resources.Warning
-                      : Resources.EnumValue;
+                      ? (background.IsLight() ? Resources.Warning : Resources.Warning_i)
+                      : (background.IsLight() ? Resources.EnumValue : Resources.EnumValue_i);
          }
 
          return null;

diff --git a/src/Dsl/CustomCode/Partials/GeneralizationConnector.cs b/src/Dsl/CustomCode/Partials/GeneralizationConnector.cs
@@ -1,11 +1,24 @@
-using Microsoft.VisualStudio.Modeling.Diagrams;
+using Microsoft.VisualStudio.Modeling;
+using Microsoft.VisualStudio.Modeling.Diagrams;
 
 namespace Sawczyn.EFDesigner.EFModel
 {
-   public partial class GeneralizationConnector: IHasStore
+   public partial class GeneralizationConnector: IHasStore, IThemeable
    {
       public override bool HasToolTip => true;
 
+      public void SetThemeColors(DiagramThemeColors diagramColors)
+      {
+         using (Transaction tx = Store.TransactionManager.BeginTransaction("Set diagram colors"))
+         {
+            Color = diagramColors.Background.LegibleTextColor();
+            TextColor = diagramColors.Text;
+            Invalidate();
+
+            tx.Commit();
+         }
+      }
+
       public override string GetToolTipText(DiagramItem item)
       {
          return item.Shape.ModelElement is Generalization generalization
@@ -24,5 +37,16 @@ protected override int ModifyLuminosity(int currentLuminosity, DiagramClientView
          // so if it's black we're highlighting, return 130, since that looks ok.
          return baseCalculation == 40 ? 130 : baseCalculation;
       }
+
+      /// <summary>
+      /// This method is called when a shape is inititially created, derived classes can
+      /// override to perform shape instance initialization.  This method is always called within a transaction.
+      /// </summary>
+      public override void OnInitialize()
+      {
+         base.OnInitialize();
+         if (ModelDisplay.GetDiagramColors != null)
+            SetThemeColors(ModelDisplay.GetDiagramColors());
+      }
    }
 }