Changeset 7581 for trunk

Timestamp:

03/07/12 16:08:50 (13 years ago)

Author:

mkommend

Message:

#1790: Opened a new symbol view on double click in the GrammarEditor and set the SymbolView as default view for ISymbols.

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Files:

• SymbolView.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.Designer.cs (modified) (1 diff)
• SymbolicExpressionGrammarEditorView.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views {
   [View("Symbol View")]
-  [Content(typeof(ISymbol), false)]
+  [Content(typeof(ISymbol), true)]
   public partial class SymbolView : NamedItemView {
     public new ISymbol Content {

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.Designer.cs

@@ -170 +170 @@
       this.symbolsTreeView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.symbolsTreeView_KeyDown);
       this.symbolsTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.symbolsTreeView_MouseDown);
+      this.symbolsTreeView.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(symbolsTreeView_NodeMouseDoubleClick);
       // 
       // imageList

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

@@ -62 +62 @@
         copyButton.Enabled = false;
         treeViewBackColor = symbolsTreeView.BackColor;
-        symbolsTreeView.BackColor = Color.FromArgb(255,240,240,240);
+        symbolsTreeView.BackColor = Color.FromArgb(255, 240, 240, 240);
       } else {
         addButton.Enabled = true;
@@ -125 +125 @@
     #endregion
 
-    private bool internalTreeViewUpdateInProgress = false;
     private void UpdateSymbolsTreeView() {
-      internalTreeViewUpdateInProgress = true;
       var symbols = Content.Symbols.ToList();
       foreach (var treeNode in IterateTreeNodes().ToList()) {
@@ -140 +138 @@
 
       RebuildImageList();
-      internalTreeViewUpdateInProgress = false;
     }
 
@@ -181 +178 @@
 
     private void symbolsTreeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
-      if (internalTreeViewUpdateInProgress) return;      
       if (Content == null || Content.ReadOnly) e.Cancel = true;
       if (ReadOnly || Locked) e.Cancel = true;
@@ -187 +183 @@
 
     #region drag & drop operations
-    private GroupSymbol parentOfDraggedSymbol;
     private void symbolsTreeView_ItemDrag(object sender, ItemDragEventArgs e) {
       if (!Locked) {
         var treeNode = e.Item as TreeNode;
-        if (treeNode.Parent != null) parentOfDraggedSymbol = treeNode.Parent.Tag as GroupSymbol;
         var data = new DataObject();
         data.SetData(HeuristicLab.Common.Constants.DragDropDataFormat, treeNode.Tag);
@@ -257 +251 @@
     }
 
+    private void symbolsTreeView_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e) {
+      var symbol = e.Node.Tag as ISymbol;
+      if (symbol == null) return;
+      if (e.Button != MouseButtons.Left) return;
+      if (e.X < e.Node.Bounds.Left - symbolsTreeView.ImageList.Images[e.Node.ImageIndex].Width || e.X > e.Node.Bounds.Right) return;
+      MainFormManager.MainForm.ShowContent(symbol);
+      e.Node.Toggle();
+    }
+
     private void symbolsTreeView_KeyDown(object sender, KeyEventArgs e) {
       if (Content == null || Content.ReadOnly || ReadOnly || Locked) return;
@@ -424 +427 @@
 
   //this class is necessary to prevent double clicks which do not fire the checkbox checked event
+  //workaround taken from http://connect.microsoft.com/VisualStudio/feedback/details/374516/treeview-control-does-not-fire-events-reliably-when-double-clicking-on-checkbox
   internal class CheckBoxTreeView : TreeView {
     protected override void WndProc(ref Message m) {
       // Suppress WM_LBUTTONDBLCLK
-      if (m.Msg == 0x203) { m.Result = IntPtr.Zero; } else base.WndProc(ref m);
+      if (m.Msg == 0x203 && IsOnCheckBox(m)) { m.Result = IntPtr.Zero; } else base.WndProc(ref m);
+    }
+
+    private int GetXLParam(IntPtr lParam) {
+      return lParam.ToInt32() & 0xffff;
+    }
+
+    private int GetYLParam(IntPtr lParam) {
+      return lParam.ToInt32() >> 16;
+    }
+
+    private bool IsOnCheckBox(Message m) {
+      int x = GetXLParam(m.LParam);
+      int y = GetYLParam(m.LParam);
+      TreeNode node = this.GetNodeAt(x, y);
+      return ((x <= node.Bounds.Left - 20) && (x >= node.Bounds.Left - 32));
     }
   }