src/Builder4/WindowRooView.bjs

[app.Builder.js] / src / Builder4 / WindowRooView.vala

diff --git a/src/Builder4/WindowRooView.vala b/src/Builder4/WindowRooView.vala
index eaad293..6906c41 100644 (file)
--- a/src/Builder4/WindowRooView.vala
+++ b/src/Builder4/WindowRooView.vala
@@ -933,6 +933,7 @@ public class Xcls_WindowRooView : Object
             // my vars (def)
         public bool loading;
         public bool allow_node_scroll;
+        public JsRender.Node? node;
         public string propSelected;
 
         // ctor
@@ -945,6 +946,7 @@ public class Xcls_WindowRooView : Object
             // my vars (dec)
             this.loading = true;
             this.allow_node_scroll = true;
+            this.node = null;
             this.propSelected = "";
 
             // set gobject values
@@ -1105,18 +1107,20 @@ public class Xcls_WindowRooView : Object
         public void nodeSelected (JsRender.Node? sel, bool scroll ) {
           
             
-          
+               
             // this is connected in widnowstate
-            print("node selected\n");
-            var buf = this.el.get_buffer();
-         
-            var sbuf = (Gtk.SourceBuffer) buf;
         
-           
+        
+               // not sure why....   
             while(Gtk.events_pending()) {
                 Gtk.main_iteration();
             }
             
+        
+            print("node selected\n");
+            var buf = this.el.get_buffer();
+            var sbuf = (Gtk.SourceBuffer) buf;
+        
            
             // clear all the marks..
             Gtk.TextIter start;
@@ -1157,6 +1161,9 @@ public class Xcls_WindowRooView : Object
             
             
             this.el.editable = false;
+            
+            var colon_pos = 0;
+            
             // now if we have selected a property...
             if (this.propSelected.length> 0 ) {
         
@@ -1164,27 +1171,45 @@ public class Xcls_WindowRooView : Object
                        if (sel.getPropertyRange(this.propSelected, out nstart, out nend) && nend > nstart) {
                                start_line = nstart;
                                end_line = nend;
+                               this.el.editable = true;
+                               print("start line = %d, end line = %d\n", start_line, end_line);
                                
-                               if (start_line == cursor_at_line) {
                                        // see if we are 'right of ':'
                                        // get an iter for the start of the line.
-                                       Gtk.TextIter start_line_iter;
-                                       this.el.buffer.get_iter_at_line(out start_line_iter, cursor_at_line);
-                                       var before_cursor_string = this.el.buffer.get_text(start_line_iter, cur_iter);
+                               Gtk.TextIter start_line_iter,end_line_iter;
+                               this.el.buffer.get_iter_at_line(out start_line_iter, start_line -1);
+                               this.el.buffer.get_iter_at_line(out end_line_iter, start_line -1);
+                                
+                               
+                               
+                               
+                               if (end_line_iter.forward_to_line_end()) {
+                                       var first_line  = this.el.buffer.get_text(start_line_iter, end_line_iter, false);
+                                       print("first line = %s\n", first_line);
+                                       if (first_line.contains(":")) {
+                                               colon_pos = start_line_iter.get_offset() + first_line.index_of(":");
+                                       }
+                                       print("colon_pos  = %d\n", colon_pos);
+                               }
+                               print("is cursor at line? %d ?= %d\n", start_line -1 , cursor_at_line);
+                               if (start_line - 1 == cursor_at_line) {
+                                       print("cursor is on current line.\n");
+                                       var before_cursor_string = this.el.buffer.get_text(start_line_iter, cur_iter, false);
+                                       print("before cursor string =  %s\n", before_cursor_string);
                                        if (!before_cursor_string.contains(":")) {
-                                               this.editable = false;
+                                               this.el.editable = false;
                                        }
                                        
                                }
                                
-                               this.el.editable = true;
+                               
                        }
                        print("propSelected = %s range  %d -> %d\n", this.propSelected, start_line, end_line);          
                        
                        
             }
             
-            
+               print("checking selection\n");
             
             
             // check selection - if it's out of 'bounds'
@@ -1197,6 +1222,14 @@ public class Xcls_WindowRooView : Object
                                // save?
                                this.el.editable = false;
                        }
+                       if (colon_pos > 0 &&
+                               (sel_start_iter.get_offset() < colon_pos || sel_end_iter.get_offset() < colon_pos)
+                               
+                       ) {
+                               this.el.editable = false;
+                       }
+                       
+                        
             
             }