add a gesture for guide creation

and better guide drawing

Author: jcupitt

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - fix select modifier handling
 - add region resize and drag snap
-- add hguide and vguide regions
+- add hguide and vguide, plus a gesture for creation
 - improve menu homing
 - improve antialias on zoom out
 - add region context menu

meson.build

@@ -1,6 +1,6 @@
 project('nip4', 'c',
   # ie. a major after nip2 8.9 for workspace save file versioning
-  version: '9.0.9-1',
+  version: '9.0.9-2',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [

org.libvips.nip4.json

@@ -334,7 +334,7 @@
                 {
                     "type" : "git",
                     "url" : "https://github.com/jcupitt/nip4.git",
-                    "tag" : "v9.0.9"
+                    "tag" : "v9.0.9-2"
                 }
             ]
         }

src/imageui.c

@@ -1266,6 +1266,18 @@ imageui_region_new(Imageui *imageui, RegionviewType type, VipsRect *rect)
 			vips_buf_appendd(&buf, rect->height);
 			break;
 
+		case REGIONVIEW_HGUIDE:
+			vips_buf_appendf(&buf, "%s ", CLASS_HGUIDE);
+			row_qualified_name(row, &buf);
+			vips_buf_appendd(&buf, VIPS_RECT_BOTTOM(rect));
+			break;
+
+		case REGIONVIEW_VGUIDE:
+			vips_buf_appendf(&buf, "%s ", CLASS_VGUIDE);
+			row_qualified_name(row, &buf);
+			vips_buf_appendd(&buf, VIPS_RECT_RIGHT(rect));
+			break;
+
 		default:
 			g_assert_not_reached();
 		}

src/regionview.c

@@ -278,6 +278,28 @@ regionview_draw_init_region_label(Regionview *regionview)
 		2 * regionview_label_margin;
 }
 
+static void
+regionview_draw_init_guide_label(Regionview *regionview)
+{
+	if (regionview->draw_type == REGIONVIEW_HGUIDE) {
+		regionview->label.left = regionview->frame.left;
+		regionview->label.top = regionview->frame.top
+			- 2 * regionview_label_margin
+			- regionview->ink_rect.height
+			- regionview_line_width;
+	}
+	else {
+		regionview->label.left = regionview->frame.left
+			+ regionview_line_width;
+		regionview->label.top = regionview->frame.top;
+	}
+
+	regionview->label.width = regionview->ink_rect.width +
+		2 * regionview_label_margin;
+	regionview->label.height = regionview->ink_rect.height +
+		2 * regionview_label_margin;
+}
+
 /* gsk clips the case where the region is completely off screen, but does
  * NOT clip if we are within the rect. This will cause terrible
  * performance and even crashes with large zooms.
@@ -549,19 +571,24 @@ static void
 regionview_draw_guide(Regionview *regionview, GtkSnapshot *snapshot)
 {
 	Imageui *imageui = regionview->imageui;
-	double zoom = imageui_get_zoom(imageui);
-
-	// two points to mark
-	double left;
-	double top;
-	imageui_image_to_gtk(imageui,
-		regionview->draw_area.left, regionview->draw_area.top, &left, &top);
-	regionview->frame.left = left;
-	regionview->frame.top = top;
-	regionview->frame.width = regionview->draw_area.width * zoom;
-	regionview->frame.height = regionview->draw_area.height * zoom;
+	Tilesource *tilesource = imageui_get_tilesource(imageui);
+
+	// the full width or height of the image
+	if (regionview->draw_type == REGIONVIEW_HGUIDE) {
+		regionview->frame.left = 0;
+		regionview->frame.top = VIPS_RECT_BOTTOM(&regionview->draw_area);
+		regionview->frame.width = tilesource->display_width;
+		regionview->frame.height = 0;
+	}
+	else {
+		regionview->frame.left = VIPS_RECT_RIGHT(&regionview->draw_area);
+		regionview->frame.top = 0;
+		regionview->frame.width = 0;
+		regionview->frame.height = tilesource->display_height;
+	}
+	imageui_image_to_gtk_rect(imageui, &regionview->frame, &regionview->frame);
 
-	regionview_draw_init_region_label(regionview);
+	regionview_draw_init_guide_label(regionview);
 
 	regionview_draw_label_shadow(regionview, snapshot);
 
@@ -750,11 +777,18 @@ regionview_hit(Regionview *regionview, int x, int y)
 static void
 regionview_pick_type(Regionview *regionview)
 {
-	if (abs(regionview->our_area.width) < 10)
+	if (abs(regionview->our_area.width) < 10 &&
+		abs(regionview->our_area.height) < 10)
 		regionview->type = REGIONVIEW_MARK;
 	else if (regionview->our_area.width > 0 &&
 		regionview->our_area.height > 0)
 		regionview->type = REGIONVIEW_REGION;
+	else if (regionview->our_area.width < 0 &&
+		regionview->our_area.height > 0)
+		regionview->type = REGIONVIEW_HGUIDE;
+	else if (regionview->our_area.width > 0 &&
+		regionview->our_area.height < 0)
+		regionview->type = REGIONVIEW_VGUIDE;
 	else
 		regionview->type = REGIONVIEW_ARROW;
 }
@@ -859,7 +893,6 @@ regionview_resize(Regionview *regionview, guint modifiers,
 		break;
 	}
 
-
 	if (!regionview->frozen)
 		regionview_pick_type(regionview);