aboutsummaryrefslogtreecommitdiffstatsci
path: root/src/GraphicObjects/TemplatedContainer.cs
diff options
context:
space:
mode:
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>2018-02-15 14:58:36 +0100
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>2018-02-15 14:58:36 +0100
commitc1b29a565bdbf37fd88d268588710ce8f4f84d5b (patch)
tree37ec254f01bb8d2bad971c137fa787ca76a194d1 /src/GraphicObjects/TemplatedContainer.cs
parent0efa7446134489edd303b349ae1220f1c4228e9a (diff)
CrowIDE WIP, context commands, tooltips, PointIsIn(ref point), configuration no longer static.
also: - remove default null value for datasource - dschange sender changed in group and privateContainer - try closing menuItem, should debug - Contains search also template in TemplatedContainer - change in nodeAddress: expresion starting with '/' means current node - MouseEventArgs CTOR with one source button - RemoveWidget trigger check HoverWidget - Orientation binding in Menu template
Diffstat (limited to 'src/GraphicObjects/TemplatedContainer.cs')
-rw-r--r--src/GraphicObjects/TemplatedContainer.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs
index 31bbc436..3e0dd801 100644
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/TemplatedContainer.cs
@@ -77,12 +77,11 @@ namespace Crow
}
public override bool Contains (GraphicObject goToFind)
{
- if (Content == null)
- return base.Contains (goToFind);
-
if (Content == goToFind)
return true;
- return Content.Contains (goToFind);
+ if (Content?.Contains (goToFind) == true)
+ return true;
+ return base.Contains (goToFind);
}
#endregion
}