better subrow finding

Author: jcupitt

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## master
 
 - better change handling in ientry improves matrixview behaviour
+- better subrow finding fixes replace from file in nested columns
 
 ## 9.0.4 2025/03/20
 

TODO

@@ -1,3 +1,10 @@
+- try
+
+	nip4 ~/lady_orig.ws
+	drag A2 into column I
+	press V (down) on A2, segv
+
+
 - "reset" in display bar resets the position of scale/offset widgets, but does
   not reset the menu items (eg. tick on falsecolour)
 
@@ -32,39 +39,14 @@
 
 - prewitt and scharr edge detectors
 
+- puts lots of stuff into Image > New eg xyz, sdf etc.
 
+- can we improve Group[]?
 
 
 
-- row reset doesn't always work
-
-	try joanne's workspace ... need to be able to reset the image pair
-
-	rowview_reset_menu() just runs model_clear_edited() on every sub-row
-
-	in turn runs heapmodel_clear_edited()
-
-  image replace from file usually won't reset properly since it rewrites the
-  formula and there's nothing to reset
-
 - could use file chooser widget in bm-workspaces, what would it look like?
 
-- ^V in an imagewindow swaps the image without rewriting the formula, could
-  we do something like that for replace from file?
-
-	no, the result wouldn't be saved
-
-- try
-
-	nip4 ~/lady-orig.ws
-
-  open A2, find A2.targets.image, right-click, replace from file, no file
-  dialog appears
-
-	what stops replace from file on a dirty row?
-
-	see rowview_action(), there's no rhs->graphic
-
 - check all batch mode flags
 
 - try to save and restore image view scale and position

src/columnview.c

@@ -655,14 +655,24 @@ columnview_rowview_hit(View *view, void *a, void *b)
 	if (!gtk_widget_compute_bounds(rview->frame, GTK_WIDGET(sview), &bounds))
 		return NULL;
 
-	if (sview_point->y > bounds.origin.y &&
-		sview_point->y < bounds.origin.y + bounds.size.height)
+	if (sview_point->x > bounds.origin.x &&
+		sview_point->y > bounds.origin.y &&
+		sview_point->y < bounds.origin.y + bounds.size.height) {
+		if (rview->rhsview &&
+			rview->rhsview->scol) {
+			View *sub;
+			if ((sub = view_map(rview->rhsview->scol,
+				columnview_rowview_hit, sview_point, sview)))
+				return sub;
+		}
+
 		return rview;
+	}
 
 	return NULL;
 }
 
-/* Find the columnview for a point.
+/* Find the rowview for a point.
  */
 Rowview *
 columnview_find_rowview(Columnview *cview, int x, int y)

src/rowview.c

@@ -87,12 +87,13 @@ rowview_attach(Rowview *rview, GtkWidget *child, int x)
 	GtkWidget *parent = gtk_widget_get_parent(child);
 	if (parent) {
 		if (IS_ROWVIEW(parent)) {
-			// if the parent is the rview, this is the first _attach of a
-			// template child and it will have a single ref, held by
-			// rview
-			//
-			// add an extra ref (dropped in _dispose) to keep the child alive
-			// across any later reparenting during row drag
+			/* If the parent is the rview, this is the first _attach of a
+			 * template child and it will have a single ref, held by
+			 * rview.
+			 *
+			 * Add an extra ref (dropped in _dispose) to keep the child alive
+			 * across any later reparenting during row drag.
+			 */
 			gtk_widget_unparent(child);
 			g_object_ref(child);
 		}
@@ -437,28 +438,24 @@ static void
 rowview_action(GSimpleAction *action, GVariant *parameter, View *view)
 {
 	Rowview *rview = ROWVIEW(view);
-	View *graphic = rview->rhsview->graphic;
 	Row *row = ROW(VOBJECT(rview)->iobject);
-	Rhs *rhs = row->child_rhs;
+	Model *graphic = row->child_rhs->graphic;
 	Workspace *ws = row->ws;
 	const char *name = g_action_get_name(G_ACTION(action));
 
-	if (graphic &&
-		g_str_equal(name, "row-edit"))
-		model_edit(GTK_WIDGET(rview), MODEL(rhs));
+	if (g_str_equal(name, "row-edit") && graphic)
+		model_edit(GTK_WIDGET(rview), MODEL(graphic));
 	else if (g_str_equal(name, "row-duplicate"))
 		rowview_duplicate(rview);
-	else if (g_str_equal(name, "row-saveas") &&
-		rhs->graphic)
-		classmodel_graphic_save(CLASSMODEL(rhs->graphic), GTK_WIDGET(rview));
+	else if (g_str_equal(name, "row-saveas") && graphic)
+		classmodel_graphic_save(CLASSMODEL(graphic), GTK_WIDGET(rview));
 	else if (g_str_equal(name, "row-delete")) {
 		if (workspace_selected_num(ws) < 2)
 			row_select(row);
 		workspace_selected_remove_yesno(ws, view_get_window(VIEW(rview)));
 	}
-	else if (g_str_equal(name, "row-replace") &&
-		rhs->graphic)
-		classmodel_graphic_replace(CLASSMODEL(rhs->graphic), GTK_WIDGET(rview));
+	else if (g_str_equal(name, "row-replace") && graphic)
+		classmodel_graphic_replace(CLASSMODEL(graphic), GTK_WIDGET(rview));
 	else if (g_str_equal(name, "row-group"))
 		rowview_group(rview);
 	else if (g_str_equal(name, "row-ungroup"))
@@ -580,3 +577,16 @@ rowview_get_visible(Rowview *rview)
 {
 	return rview->visible;
 }
+
+Rowview *
+rowview_get_top(Rowview *rview)
+{
+	View *enclosing = VIEW(rview)->parent->parent;
+
+	if (IS_COLUMNVIEW(enclosing))
+		// rview in a subcolumnview in a columnview, so a top-level rowview
+		return rview;
+	else
+		// rview in a subcolumnview in a rhsview, so a nested rowview
+		return rowview_get_top(RHSVIEW(enclosing)->rview);
+}

src/rowview.h

@@ -45,7 +45,6 @@ struct _Rowview {
 	gboolean visible; /* Currently visible */
 	int rnum;		  /* Row of subcolumn we are in */
 
-	GtkWidget *top;	  /* Enclosing box for our widgets */
 	GtkWidget *spin;  /* Class display open/close widgets */
 	GtkWidget *frame; /* Row name box */
 	GtkWidget *label; /* Row label */
@@ -76,3 +75,4 @@ View *rowview_new(void);
 void rowview_get_position(Rowview *rview, int *x, int *y, int *w, int *h);
 void rowview_set_visible(Rowview *rview, gboolean visible);
 gboolean rowview_get_visible(Rowview *rview);
+Rowview *rowview_get_top(Rowview *rview);

src/view.h

@@ -107,7 +107,7 @@ typedef struct _ViewClass {
 	void (*scrollto)(View *, ModelScrollPosition);
 	void (*layout)(View *);
 
-	/* A GAction in the enclosing window.
+	/* A GAction on this view.
 	 */
 	void (*action)(GSimpleAction *action, GVariant *parameter, View *view);
 } ViewClass;

src/workspaceview.c

@@ -1035,15 +1035,17 @@ workspaceview_drag_begin(GtkEventControllerMotion *self,
 			wview->obj_y = cview->y;
 		}
 		else if (cview) {
-			Rowview *rview = columnview_find_rowview(cview, start_x, start_y);
+			Rowview *local = columnview_find_rowview(cview, start_x, start_y);
+
+			if (local) {
+				Rowview *top = rowview_get_top(local);
 
-			if (rview) {
 				graphene_rect_t bounds;
-				if (!gtk_widget_compute_bounds(GTK_WIDGET(rview->frame),
+				if (!gtk_widget_compute_bounds(GTK_WIDGET(top->frame),
 						wview->fixed, &bounds))
 					return;
 
-				wview->drag_rview = rview;
+				wview->drag_rview = top;
 				wview->state = WVIEW_SELECT;
 				wview->obj_x = bounds.origin.x;
 				wview->obj_y = bounds.origin.y;
@@ -1125,16 +1127,18 @@ workspaceview_drag_update(GtkEventControllerMotion *self,
 
 				if (cview) {
 					// row we are over
-					Rowview *rview = columnview_find_rowview(cview,
+					Rowview *local = columnview_find_rowview(cview,
 						mouse_x, mouse_y);
 
-					if (rview) {
+					if (local) {
+						Rowview *top = rowview_get_top(local);
+
 						graphene_rect_t bounds;
-						if (!gtk_widget_compute_bounds(GTK_WIDGET(rview->frame),
+						if (!gtk_widget_compute_bounds(GTK_WIDGET(top->frame),
 								wview->fixed, &bounds))
 							return;
 
-						Row *row = ROW(VOBJECT(rview)->iobject);
+						Row *row = ROW(VOBJECT(top)->iobject);
 						int pos = 2 * ICONTAINER(row)->pos + 1;
 						if (mouse_y > bounds.origin.y + bounds.size.height / 2)
 							workspaceview_move_row_shadow(wview,