Fix #8024 - replace crappy columnview row detection
[roobuilder] / src / Builder4 / WindowLeftTree.bjs
index 0811407..045fbee 100644 (file)
        "string name" : "left-tree-view",
        "xtype" : "ColumnView",
        "| Gtk.Widget? getWidgetAt" : [
-        "(double x,  double in_y) {",
-        "/*",
-        "    \t",
-        "from    \thttps://discourse.gnome.org/t/gtk4-finding-a-row-data-on-gtkcolumnview/8465",
-        "    \tvar colview = gesture.widget;",
-        "    \tvar line_no = check_list_widget(colview, x,y);",
-        "         if (line_no > -1) {",
-        "    \t\tvar item = colview.model.get_item(line_no);",
-        "    \t\t ",
-        "    \t}",
-        "    \t*/",
-        "    \tvar y = in_y + _this.viewwin.el.vadjustment.value; ",
-        "        var  child = this.el.get_first_child(); ",
-        "    \t//Gtk.Allocation alloc = { 0, 0, 0, 0 };",
-        "    \tvar line_no = -1; ",
-        "    \tvar reading_header = true;",
-        "    \tvar curr_y = 0;",
-        "    \tvar header_height  = 0;",
-        "    \tvar h = 0;",
-        "    \twhile (child != null) {",
-        "\t\t\t//GLib.debug(\"Got %s\", child.get_type().name());",
-        "\t        if (reading_header) {",
-        "\t\t\t\t",
-        "",
-        "\t\t\t\tif (child.get_type().name() != \"GtkColumnListView\") {",
-        "\t\t\t        h += child.get_height();",
-        "\t\t\t\t\tchild = child.get_next_sibling();",
-        "\t\t\t\t\tcontinue;",
-        "\t\t\t\t}",
-        "\t\t\t\t// should be columnlistview",
-        "\t\t\t\tchild = child.get_first_child(); ",
-        "\t\t\t    GLib.debug(\"header height=%d\", h);",
-        "\t\t\t\theader_height =  h;",
-        "\t\t\t\t",
-        "\t\t\t\treading_header = false;",
-        "\t\t\t\tcontinue;",
-        "\t        }",
-        "\t\t    line_no++;",
-        "",
-        "\t\t\tif (y < header_height) {",
-        "\t\t    \treturn null;",
-        "\t    \t}",
-        "",
-        "\t\t\tvar hh = child.get_height();",
-        "\t\t\t//GLib.debug(\"got cell xy = %d,%d  w,h= %d,%d\", alloc.x, alloc.y, alloc.width, alloc.height);",
-        "\t\t\tif (child.has_css_class(\"node-err\") || ",
-        "\t\t\t\tchild.has_css_class(\"node-warn\") || ",
-        "\t\t\t\tchild.has_css_class(\"node-depr\")) {",
-        "\t\t\t\thh += 10;",
-        "\t\t\t",
-        "\t\t\t}\t",
-        "\t\t    if (y > curr_y && y <= header_height + hh + curr_y ) {",
-        "\t\t\t    return (Gtk.Widget)child;",
-        "\t\t    }",
-        "\t\t    curr_y +=  hh ;",
+        "(double x,  double  y) {",
         "",
-        "\t\t    if (curr_y > y) {",
-        "\t\t        return null;",
-        "\t        }",
-        "\t        child = child.get_next_sibling(); ",
-        "    \t}",
-        "        return null;",
+        "\tvar w = this.el.pick(x, y, Gtk.PickFlags.DEFAULT);",
+        "\t//GLib.debug(\"got widget %s\", w == null ? \"nothing\" : w.get_type().name());",
+        "\tif (w == null) {",
+        "\t\treturn null;",
+        "\t}",
+        "\t",
+        "\tvar row= w.get_ancestor(GLib.Type.from_name(\"GtkColumnViewRowWidget\"));",
+        "\tif (row == null) {",
+        "\t\treturn null;",
+        "\t}",
+        "\treturn row;",
+        " ",
         "",
         " }"
        ],
         " }"
        ],
        "| int getRowAt" : [
-        "(double x,  double in_y, out string pos) {",
-        "",
+        "(double x,  double  y, out string pos) {",
         "",
+        "\tvar w = this.el.pick(x, y, Gtk.PickFlags.DEFAULT);",
+        "\t//GLib.debug(\"got widget %s\", w == null ? \"nothing\" : w.get_type().name());",
+        "\tif (w == null) {",
+        "\t\treturn -1;",
+        "\t}",
+        "\t",
+        "\tvar row= w.get_ancestor(GLib.Type.from_name(\"GtkColumnViewRowWidget\"));",
+        "\tif (row == null) {",
+        "\t\treturn -1;",
+        "\t}",
+        "\t",
+        "\t//GLib.debug(\"got colview %s\", row == null ? \"nothing\" : row.get_type().name());",
         "\t ",
-        "",
-        "/*",
-        "    \t",
-        "from    \thttps://discourse.gnome.org/t/gtk4-finding-a-row-data-on-gtkcolumnview/8465",
-        "    \tvar colview = gesture.widget;",
-        "    \tvar line_no = check_list_widget(colview, x,y);",
-        "         if (line_no > -1) {",
-        "    \t\tvar item = colview.model.get_item(line_no);",
-        "    \t\t ",
-        "    \t}",
-        "    \t*/",
-        " \t\t ",
-        " \t\t",
-        " \t\tGLib.debug(\"get Widget At Row x = %d  y = %d\", (int) x, (int) in_y);",
-        "    \tvar y = in_y + _this.viewwin.el.vadjustment.value; ",
-        "        var  child = this.el.get_first_child(); ",
-        "    \t//Gtk.Allocation alloc = { 0, 0, 0, 0 };",
-        "    \tvar line_no = -1; ",
-        "    \tvar reading_header = true;",
-        "    \tvar real_y = 0;",
-        "    \tvar header_height  = 0;",
-        "    \tpos = \"none\";",
-        "    \tvar h = 0;",
-        "    \twhile (child != null) {",
-        "\t\t\t//GLib.debug(\"Got %s\", child.get_type().name());",
-        "    \t    if (reading_header) {",
-        "\t\t\t\t",
-        "",
-        "\t\t\t\tif (child.get_type().name() != \"GtkColumnListView\") {",
-        "\t\t\t        h += child.get_height();",
-        "\t\t\t\t\tchild = child.get_next_sibling();",
-        "\t\t\t\t\tcontinue;",
-        "\t\t\t\t}",
-        "\t\t\t\t// should be columnlistview",
-        "\t\t\t\tchild = child.get_first_child(); ",
-        "\t\t\t    //GLib.debug(\"header height=%d\", h);",
-        "\t\t\t\theader_height =  h;",
-        "\t\t\t\t",
-        "\t\t\t\treading_header = false;",
-        "\t\t\t\tcontinue;",
-        "\t\t\t\t",
-        "\t        }",
-        "\t        ",
-        "\t\t    if (child.get_type().name() != \"GtkColumnViewRowWidget\") {",
-        "    \t\t    child = child.get_next_sibling();",
-        "    \t\t    continue;",
-        "\t\t    }",
-        "\t\t    ",
-        "\t\t \tif (y < header_height) {",
-        "\t\t    \treturn -1;",
-        "\t    \t}",
-        "\t\t    ",
-        "\t\t    line_no++;",
-        "\t\t\tvar hh = child.get_height();",
-        "\t\t\t",
-        "\t\t\tif (child.has_css_class(\"node-err\") || ",
-        "\t\t\t\tchild.has_css_class(\"node-warn\") || ",
-        "\t\t\t\tchild.has_css_class(\"node-depr\")) {",
-        "\t\t\t\thh += 10;",
-        "\t\t\t",
-        "\t\t\t}",
-        "\t\t\t//child.get_allocation(out alloc);",
-        "\t\t\t//GLib.debug(\"got cell xy = %d,%d  w,h= %d,%d\", alloc.x, alloc.y, alloc.width, alloc.height);",
-        "\t\t\t//GLib.debug(\"row %d y= %d %s\", line_no, (int) (header_height + alloc.y),",
-        "\t\t\t",
-        "\t\t\t//\tchild.visible ? \"VIS\" : \"hidden\");",
-        "",
-        "\t\t    if (y >  (header_height + real_y) && y <= (header_height +  real_y + hh) ) {",
-        "\t\t    \tif (y > ( header_height + real_y + (hh * 0.8))) {",
-        "\t\t    \t\tpos = \"below\";",
-        "\t    \t\t} else if (y > ( header_height + real_y + (hh * 0.2))) {",
-        "\t    \t\t\tpos = \"over\";",
-        "    \t\t\t} else {",
-        "    \t\t\t\tpos = \"above\";",
-        "\t\t\t\t}",
-        "\t\t    \t GLib.debug(\"getRowAt return : %d, %s\", line_no, pos);",
-        "\t\t\t    return line_no;",
-        "\t\t    }",
-        " ",
-        "",
-        "\t\t    if (real_y + hh > y) {",
-        "\t\t        return -1;",
-        "\t        }",
-        "\t        real_y += hh;",
-        "\t        child = child.get_next_sibling(); ",
-        "    \t}",
-        "        return -1;",
-        "",
+        "\tvar rn = 0;",
+        "\tvar cr = row;",
+        "\t ",
+        "\twhile (cr.get_prev_sibling() != null) {",
+        "\t\trn++;",
+        "\t\tcr = cr.get_prev_sibling();",
+        "\t}",
+        "\t",
+        "\t//GLib.debug(\"row number is %d\", rn);",
+        "\t//GLib.debug(\"click %d, %d\", (int)x, (int)y);",
+        "\t// above or belw",
+        "\tGraphene.Rect  bounds;",
+        "\trow.compute_bounds(this.el, out bounds);",
+        "\t//GLib.debug(\"click x=%d, y=%d, w=%d, h=%d\", ",
+        "\t//\t(int)bounds.get_x(), (int)bounds.get_y(),",
+        "\t//\t(int)bounds.get_width(), (int)bounds.get_height()",
+        "\t//\t);",
+        "\tvar ypos = y - bounds.get_y();",
+        "\t//GLib.debug(\"rel ypos = %d\", (int)ypos);\t",
+        "\tvar rpos = 100.0 * (ypos / bounds.get_height());",
+        "\t//GLib.debug(\"rel pos = %d %%\", (int)rpos);",
+        "\tpos = \"over\";",
+        "\t",
+        "\tif (rpos > 80) {",
+        "\t\tpos = \"below\";",
+        "\t} else if (rpos < 20) {",
+        "\t\tpos = \"above\";",
+        "\t} ",
+        "\treturn rn;",
         " }"
        ]
       },