row drag cancel with esc

Author: jcupitt

CHANGELOG.md

@@ -11,6 +11,8 @@
 - toolkitgroupview is more compact
 - add vips_header_get builtin
 - add Real, Group, Vector graphic classes
+- better row drop
+- cancel row drag with Esc
 
 ## 9.0.11 2025/07/21
 

TODO

@@ -1,3 +1,6 @@
+
+- annoying animation feedback when dragging rows
+
 - get judder with rotate and images smaller than the window
 
 	draw on update, then draw again on relayout
@@ -29,84 +32,12 @@
 
   works for flatpak
 
-# menu redesign
-
-- maxpos, then create mark from coordinate should be two clicks
-
-- try:
-
-	minpair image constant
-
-  fails with
-
-	error in binary if_then_else
-	left = <256x256 uchar, 1 band, b-w 0x55a4921d3ed0>
-	right = [<256x256 float, 1 band, b-w 0x55a4918a6d60>, 12]
-	called from "minpair"
-
-  try:
-
-	if_then_else (A11 < 12).value [A11.value, 12]
-
-  also fails (works for Image though)
-
-	because constant expansion is done by the Image class
-
-  we'll need to do constant expansion in minpair
-
-- implement Menuseparator?
-
-	we've implemented #separator
-
-- the nip4 menus need reworking to use max_alpha 255 for scrgb
-
-- add something to find unresolved symbols
-
-- get rid of im_copy_set etc.
-
-	add copy_set to stdenv, and that uses vips_call9
-
-- perspective distort could have an "interpoplate" option (always bilinear
-  right now)
-
-- rename Image_type as Image_interpretation
-
-- try:
-
-	Matrix_build_item.Matrix_laplacian_item.action
-
-	Matrix_build_item.Matrix_gaussian_item.action
-
-  edit a cell and hit enter, lose the widgets, same happens in nip2
-
-  do we need to define a Matrix_base member in Matrix_gaussian_item.action?
-
-- add "smooth" option to union/intersection/difference?
-
-	see https://iquilezles.org/articles/distfunctions/
-
-  translate, rotate etc? need xyz for that
-
-- Grey ramp, checkerboard, grid CIELAB slice -> Test Images
-
-- magic kernel
-
-- use vips_addalpha() operation
-
-- remove use of cache (it's tilecache only now)
-
-- prewitt and scharr edge detectors
-
-- puts lots of stuff into Image > New eg xyz, sdf etc.
-
-- can we improve Group[]?
-
-
-
 - could use file chooser widget in bm-workspaces, what would it look like?
 
 - check all batch mode flags
 
+	see eg. vips-bench nip4 benchmark
+
 - try to save and restore image view scale and position
 
 	this failed last time I tried :(
@@ -132,8 +63,6 @@
   see imagewindow_set_tilesource() and uncomment the call to
   imageui_set_bestfit() to work on this again
 
-- still getting buffer ownership assert fails with libvips built in debug mode
-
 - need preferences?
 
 	or just remove it all

src/gtk/workspaceview.ui

@@ -162,6 +162,13 @@
                       </object>
                     </child>
 
+                    <child>
+                      <object class="GtkEventControllerKey">
+                        <signal name="key-pressed"
+                                handler="workspaceview_key_pressed"/>
+                      </object>
+                    </child>
+
                   </object>
                 </child>
 

src/workspaceview.c

@@ -977,6 +977,30 @@ workspaceview_float_rowview(Workspaceview *wview, Rowview *rview)
 	vobject_refresh(VOBJECT(wview->old_sview));
 }
 
+static void
+workspaceview_undo_row_drag(Workspaceview *wview)
+{
+	Rowview *rview = wview->drag_rview;
+
+	g_object_ref(rview);
+
+	g_assert(IS_SUBCOLUMNVIEW(wview->old_sview));
+	g_assert(IS_ROWVIEW(rview));
+
+	view_child_remove(VIEW(rview));
+	// the row number has to be wrong or reattach is skipped
+	rview->rnum = -1;
+	view_child_add(VIEW(wview->old_sview), VIEW(rview));
+
+	g_object_unref(rview);
+
+	// the row and the old containing column need to refresh
+	Row *row = ROW(VOBJECT(rview)->iobject);
+	iobject_changed(IOBJECT(row));
+	Subcolumn *scol = SUBCOLUMN(ICONTAINER(row)->parent);
+	iobject_changed(IOBJECT(scol));
+}
+
 static void
 workspaceview_drop_rowview(Workspaceview *wview)
 {
@@ -1013,17 +1037,7 @@ workspaceview_drop_rowview(Workspaceview *wview)
 
 	// reparent the rowview back to the original column ... this is where
 	// icontainer_reparent() expects to find it
-	g_object_ref(rview);
-
-	g_assert(IS_SUBCOLUMNVIEW(wview->old_sview));
-	g_assert(IS_ROWVIEW(rview));
-
-	view_child_remove(VIEW(rview));
-	// the row number has to be wrong or reattach is skipped
-	rview->rnum = -1;
-	view_child_add(VIEW(wview->old_sview), VIEW(rview));
-
-	g_object_unref(rview);
+	workspaceview_undo_row_drag(wview);
 
 	// update the model
 	if (col == row_col) {
@@ -1172,7 +1186,9 @@ workspaceview_drag_update(GtkEventControllerMotion *self,
 					mouse_x, mouse_y);
 
 				if (cview) {
-					// row we are over
+					int pos;
+
+					// row we are over, if any
 					Rowview *local = columnview_find_rowview(cview,
 						mouse_x, mouse_y);
 
@@ -1185,14 +1201,29 @@ workspaceview_drag_update(GtkEventControllerMotion *self,
 							return;
 
 						Row *row = ROW(VOBJECT(top)->iobject);
-						int pos = 2 * ICONTAINER(row)->pos + 1;
+						pos = 2 * ICONTAINER(row)->pos + 1;
 						if (mouse_y > bounds.origin.y + bounds.size.height / 2)
-							workspaceview_move_row_shadow(wview,
-								cview, pos + 1);
+							pos += 1;
 						else
-							workspaceview_move_row_shadow(wview,
-								cview, pos - 1);
+							pos -= 1;
 					}
+					else {
+						// we are over a column, but not over a row ... we
+						// could be over the titlebar, or over the entry area
+						// at the bottom
+						Columnview *title =
+							workspaceview_find_columnview_title(wview,
+								mouse_x, mouse_y);
+
+						if (title)
+							pos = 0;
+						else
+							// not in the title, append to end of column
+							// this will get renumbered on drop
+							pos = 100000;
+					}
+
+					workspaceview_move_row_shadow(wview, cview, pos);
 				}
 				else
 					workspaceview_move_row_shadow(wview, NULL, -1);
@@ -1302,6 +1333,39 @@ workspaceview_alert_close_clicked(GtkButton *button, void *user_data)
 	workspace_set_alert(ws, FALSE);
 }
 
+static gboolean
+workspaceview_key_pressed(GtkEventControllerKey *self,
+	guint keyval, guint keycode, GdkModifierType state, gpointer user_data)
+{
+	Workspaceview *wview = WORKSPACEVIEW(user_data);
+	Workspace *ws = WORKSPACE(VOBJECT(wview)->iobject);
+
+	switch (keyval) {
+	case GDK_KEY_Escape:
+		if (wview->state == WVIEW_DRAG) {
+			wview->state = WVIEW_WAIT;
+
+			if (wview->drag_rview) {
+				// cancel row drag, remove the floating column we made
+				workspaceview_undo_row_drag(wview);
+				workspaceview_unfloat(wview);
+				workspaceview_remove_row_shadow(wview);
+				workspace_queue_layout(ws);
+			}
+			else if (wview->drag_cview) {
+				// undo column drag is tricky
+			}
+		}
+
+		break;
+
+	default:
+		break;
+	}
+
+	return FALSE;
+}
+
 static void
 workspaceview_class_init(WorkspaceviewClass *class)
 {
@@ -1332,6 +1396,7 @@ workspaceview_class_init(WorkspaceviewClass *class)
 	BIND_CALLBACK(workspaceview_drag_end);
 	BIND_CALLBACK(workspaceview_error_close_clicked);
 	BIND_CALLBACK(workspaceview_alert_close_clicked);
+	BIND_CALLBACK(workspaceview_key_pressed);
 
 	object_class->dispose = workspaceview_dispose;