Allow Shapes Drawn With PaintingStyle.stroke to Register Hits Within Bounds

example/.metadata

@@ -1,10 +1,30 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled and should not be manually edited.
+# This file should be version controlled.
 
 version:
-  revision: b1395592de68cc8ac4522094ae59956dd21a91db
+  revision: 796c8ef79279f9c774545b3771238c3098dbefab
   channel: stable
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+    - platform: linux
+      create_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+      base_revision: 796c8ef79279f9c774545b3771238c3098dbefab
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'

example/analysis_options.yaml

@@ -0,0 +1,29 @@
+# This file configures the analyzer, which statically analyzes Dart code to
+# check for errors, warnings, and lints.
+#
+# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
+# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
+# invoked from the command line by running `flutter analyze`.
+
+# The following line activates a set of recommended lints for Flutter apps,
+# packages, and plugins designed to encourage good coding practices.
+include: package:flutter_lints/flutter.yaml
+
+linter:
+  # The lint rules applied to this project can be customized in the
+  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
+  # included above or to enable additional rules. A list of all available lints
+  # and their documentation is published at
+  # https://dart-lang.github.io/linter/lints/index.html.
+  #
+  # Instead of disabling a lint rule for the entire project in the
+  # section below, it can also be suppressed for a single line of code
+  # or a specific dart file by using the `// ignore: name_of_lint` and
+  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
+  # producing the lint.
+  rules:
+    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
+    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

example/lib/main.dart

@@ -2,7 +2,6 @@ import 'package:example/screens/screen1.dart';
 import 'package:example/screens/screen2.dart';
 import 'package:example/screens/screen3.dart';
 import 'package:flutter/material.dart';
-import 'package:touchable/touchable.dart';
 
 void main() {
   runApp(MaterialApp(

example/lib/screens/screen1.dart

@@ -26,6 +26,7 @@ class _Screen1State extends State<Screen1> with SingleTickerProviderStateMixin {
                 width: 400,
                 height: 900,
                 child: CanvasTouchDetector(
+                  gesturesToOverride: [GestureType.onTapDown],
                   builder: (context) {
                     return CustomPaint(
                       painter: MyPainter(context, (String circleColor) {
@@ -74,8 +75,9 @@ class MyPainter extends CustomPainter {
   void paint(Canvas _canvas, Size size) {
     TouchyCanvas canvas = TouchyCanvas(context, _canvas);
 
-    canvas.drawCircle(Offset(0, 0), 60, Paint()..color = Colors.deepOrange, onTapDown: (_) {
-      print("orange Circle touched");
+    canvas.drawCircle(Offset(0, 0), 60, Paint()..color = Colors.deepOrange,
+        onTapDown: (_) {
+      print('orange Circle touched');
       setState('orange');
     });
 
@@ -87,16 +89,17 @@ class MyPainter extends CustomPainter {
           ..strokeWidth = 200
           ..style = PaintingStyle.stroke, onTapDown: (detail) {
       setState('black');
-      print("black line touched");
+      print('black line touched');
     });
 
     canvas.drawOval(
         Rect.fromLTWH(100, 100, 300, 400),
         Paint()
           ..color = Colors.deepPurple
           ..style = PaintingStyle.stroke
-          ..strokeWidth = 70, onTapDown: (_) {
-      print("purple oval touched");
+          ..strokeWidth = 70,
+        strokeHitBehavior: StrokeHitBehavior.withinBounds, onTapDown: (_) {
+      print('purple oval touched');
       setState('purple');
     });
 
@@ -105,21 +108,25 @@ class MyPainter extends CustomPainter {
         Paint()
           ..color = Colors.deepOrange
           ..style = PaintingStyle.stroke
-          ..strokeWidth = 50, onTapDown: (_) {
-      print("orange rect touched");
+          ..strokeWidth = 50,
+        strokeHitBehavior: StrokeHitBehavior.withinBounds, onTapDown: (_) {
+      print('orange rect touched');
       setState('orange');
     });
 
     var paint = Paint()
       ..color = Colors.greenAccent
       ..style = PaintingStyle.stroke
       ..strokeWidth = 10;
-    canvas.drawCircle(Offset(150, 50), 60, paint, onTapDown: (_) {
-      print("green Circle touched");
+    canvas.drawCircle(Offset(150, 50), 60, paint,
+        strokeHitBehavior: StrokeHitBehavior.withinBounds, onTapDown: (_) {
+      print('green Circle touched');
       setState('green');
     });
 
-    canvas.drawCircle(Offset(150, 250), 70, Paint()..color = Colors.lightBlueAccent, onTapDown: (_) {
+    canvas.drawCircle(
+        Offset(150, 250), 70, Paint()..color = Colors.lightBlueAccent,
+        onTapDown: (_) {
       print('light blue Circle tap down');
       setState('white');
     }, onTapUp: (detail) {
@@ -140,16 +147,18 @@ class MyPainter extends CustomPainter {
     });
 
     canvas.drawRRect(
-        RRect.fromLTRBR(100, 340, 300, 650, Radius.elliptical(100, 150)),
+        RRect.fromLTRBR(100, 340, 300, 650, Radius.elliptical(20, 30)),
         Paint()
           ..strokeWidth = 40
+          ..style = PaintingStyle.stroke
           ..color = Colors.grey, onTapDown: (_) {
       setState('grey');
-      print("grey RRect touched");
+      print('grey RRect touched');
     });
 
     canvas.drawRRect(
-        RRect.fromLTRBR(100 - 20.0, 340 - 20.0, 300 + 20.0, 650 + 20.0, Radius.elliptical(100 + 20.0, 150 + 20.0)),
+        RRect.fromLTRBR(100 - 20.0, 340 - 20.0, 300 + 20.0, 650 + 20.0,
+            Radius.elliptical(100 + 20.0, 150 + 20.0)),
         Paint()
           ..strokeWidth = 1
           ..style = PaintingStyle.stroke
@@ -162,7 +171,28 @@ class MyPainter extends CustomPainter {
         [Offset(129.1, 241.9)],
         Paint()
           ..color = Colors.black
-          ..strokeWidth = 10);
+          ..style = PaintingStyle.stroke
+          ..strokeWidth = 10, onTapDown: (_) {
+      print("black point touched");
+      setState('black');
+    });
+
+    canvas.drawPoints(
+        PointMode.polygon,
+        [
+          Offset(200, 200),
+          Offset(100, 200),
+          Offset(200, 100),
+          Offset(200, 200)
+        ],
+        Paint()
+          ..color = Colors.black
+          ..style = PaintingStyle.stroke
+          ..strokeWidth = 20,
+        strokeHitBehavior: StrokeHitBehavior.withinBounds, onTapDown: (_) {
+      print("black poly touched");
+      setState('black');
+    });
 
 //    _canvas.drawVertices(vertices, blendMode, paint);
 //    canvas.drawCircle(Offset(131.0, 419.00), 50 , Paint()..strokeWidth=40..color=Colors.pink,onTapDown: (_){

example/lib/screens/screen2.dart

@@ -1,6 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:touchable/touchable.dart';
 
@@ -106,7 +104,7 @@ class MyPainter extends CustomPainter {
         pi,
         false,
         Paint()..color = Colors.black, onTapDown: (detail) {
-      print("clicked");
+      print('clicked');
       if (smileAnimation.value == 90) {
         smileAnimationController.reverse();
       }
@@ -132,12 +130,13 @@ class MyPainter extends CustomPainter {
               Offset(center.dx + 15, center.dy + 25 + extraLength)
             ], true),
           Paint()..color = color, onTapDown: (_) {
-        print("On Pan Down");
+        print('On Pan Down');
         if (noseAnimationController.value == upperbound ||
             noseAnimationController.status == AnimationStatus.forward) {
           noseAnimationController.reverse();
-        } else
+        } else {
           noseAnimationController.forward();
+        }
       });
     }
 

example/lib/screens/screen3.dart

@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:touchable/touchable.dart';

example/linux/.gitignore

@@ -0,0 +1 @@
+flutter/ephemeral

example/linux/CMakeLists.txt

@@ -0,0 +1,139 @@
+# Project-level configuration.
+cmake_minimum_required(VERSION 3.10)
+project(runner LANGUAGES CXX)
+
+# The name of the executable created for the application. Change this to change
+# the on-disk name of your application.
+set(BINARY_NAME "example")
+# The unique GTK application identifier for this application. See:
+# https://wiki.gnome.org/HowDoI/ChooseApplicationID
+set(APPLICATION_ID "com.geekytech.touchable.example")
+
+# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
+# versions of CMake.
+cmake_policy(SET CMP0063 NEW)
+
+# Load bundled libraries from the lib/ directory relative to the binary.
+set(CMAKE_INSTALL_RPATH "$ORIGIN/lib")
+
+# Root filesystem for cross-building.
+if(FLUTTER_TARGET_PLATFORM_SYSROOT)
+  set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
+  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+  set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+  set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
+# Define build configuration options.
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE "Debug" CACHE
+    STRING "Flutter build mode" FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+    "Debug" "Profile" "Release")
+endif()
+
+# Compilation settings that should be applied to most targets.
+#
+# Be cautious about adding new options here, as plugins use this function by
+# default. In most cases, you should add new options to specific targets instead
+# of modifying this function.
+function(APPLY_STANDARD_SETTINGS TARGET)
+  target_compile_features(${TARGET} PUBLIC cxx_std_14)
+  target_compile_options(${TARGET} PRIVATE -Wall -Werror)
+  target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
+  target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
+endfunction()
+
+# Flutter library and tool build rules.
+set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
+add_subdirectory(${FLUTTER_MANAGED_DIR})
+
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+
+add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}")
+
+# Define the application target. To change its name, change BINARY_NAME above,
+# not the value here, or `flutter run` will no longer work.
+#
+# Any new source files that you add to the application should be added here.
+add_executable(${BINARY_NAME}
+  "main.cc"
+  "my_application.cc"
+  "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc"
+)
+
+# Apply the standard set of build settings. This can be removed for applications
+# that need different build settings.
+apply_standard_settings(${BINARY_NAME})
+
+# Add dependency libraries. Add any application-specific dependencies here.
+target_link_libraries(${BINARY_NAME} PRIVATE flutter)
+target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK)
+
+# Run the Flutter tool portions of the build. This must not be removed.
+add_dependencies(${BINARY_NAME} flutter_assemble)
+
+# Only the install-generated bundle's copy of the executable will launch
+# correctly, since the resources must in the right relative locations. To avoid
+# people trying to run the unbundled copy, put it in a subdirectory instead of
+# the default top-level location.
+set_target_properties(${BINARY_NAME}
+  PROPERTIES
+  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run"
+)
+
+
+# Generated plugin build rules, which manage building the plugins and adding
+# them to the application.
+include(flutter/generated_plugins.cmake)
+
+
+# === Installation ===
+# By default, "installing" just makes a relocatable bundle in the build
+# directory.
+set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle")
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
+endif()
+
+# Start with a clean build bundle directory every time.
+install(CODE "
+  file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\")
+  " COMPONENT Runtime)
+
+set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
+set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+
+install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
+  COMPONENT Runtime)
+
+install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+  COMPONENT Runtime)
+
+foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES})
+  install(FILES "${bundled_library}"
+    DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endforeach(bundled_library)
+
+# Fully re-copy the assets directory on each build to avoid having stale files
+# from a previous install.
+set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
+install(CODE "
+  file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
+  " COMPONENT Runtime)
+install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
+  DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
+
+# Install the AOT library on non-Debug builds only.
+if(NOT CMAKE_BUILD_TYPE MATCHES "Debug")
+  install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
+    COMPONENT Runtime)
+endif()