diff --git a/example/.metadata b/example/.metadata
index 92f6487..c9e5f2c 100644
--- a/example/.metadata
+++ b/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'
diff --git a/example/analysis_options.yaml b/example/analysis_options.yaml
new file mode 100644
index 0000000..61b6c4d
--- /dev/null
+++ b/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
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 1ad901f..2e31a3f 100644
--- a/example/lib/main.dart
+++ b/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(
diff --git a/example/lib/screens/screen1.dart b/example/lib/screens/screen1.dart
index 7edd9c7..47eded0 100644
--- a/example/lib/screens/screen1.dart
+++ b/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,7 +89,7 @@ class MyPainter extends CustomPainter {
           ..strokeWidth = 200
           ..style = PaintingStyle.stroke, onTapDown: (detail) {
       setState('black');
-      print("black line touched");
+      print('black line touched');
     });
 
     canvas.drawOval(
@@ -95,8 +97,9 @@ class MyPainter extends CustomPainter {
         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,8 +108,9 @@ 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');
     });
 
@@ -114,12 +118,15 @@ class MyPainter extends CustomPainter {
       ..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: (_){
diff --git a/example/lib/screens/screen2.dart b/example/lib/screens/screen2.dart
index b226d9d..136caa5 100644
--- a/example/lib/screens/screen2.dart
+++ b/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();
+        }
       });
     }
 
diff --git a/example/lib/screens/screen3.dart b/example/lib/screens/screen3.dart
index a581823..7a8f2a0 100644
--- a/example/lib/screens/screen3.dart
+++ b/example/lib/screens/screen3.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:touchable/touchable.dart';
diff --git a/example/linux/.gitignore b/example/linux/.gitignore
new file mode 100644
index 0000000..d3896c9
--- /dev/null
+++ b/example/linux/.gitignore
@@ -0,0 +1 @@
+flutter/ephemeral
diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt
new file mode 100644
index 0000000..2983f7a
--- /dev/null
+++ b/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()
diff --git a/example/linux/flutter/CMakeLists.txt b/example/linux/flutter/CMakeLists.txt
new file mode 100644
index 0000000..d5bd016
--- /dev/null
+++ b/example/linux/flutter/CMakeLists.txt
@@ -0,0 +1,88 @@
+# This file controls Flutter-level build steps. It should not be edited.
+cmake_minimum_required(VERSION 3.10)
+
+set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral")
+
+# Configuration provided via flutter tool.
+include(${EPHEMERAL_DIR}/generated_config.cmake)
+
+# TODO: Move the rest of this into files in ephemeral. See
+# https://github.com/flutter/flutter/issues/57146.
+
+# Serves the same purpose as list(TRANSFORM ... PREPEND ...),
+# which isn't available in 3.10.
+function(list_prepend LIST_NAME PREFIX)
+    set(NEW_LIST "")
+    foreach(element ${${LIST_NAME}})
+        list(APPEND NEW_LIST "${PREFIX}${element}")
+    endforeach(element)
+    set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE)
+endfunction()
+
+# === Flutter Library ===
+# System-level dependencies.
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
+pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0)
+pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0)
+
+set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so")
+
+# Published to parent scope for install step.
+set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE)
+set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE)
+set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE)
+set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE)
+
+list(APPEND FLUTTER_LIBRARY_HEADERS
+  "fl_basic_message_channel.h"
+  "fl_binary_codec.h"
+  "fl_binary_messenger.h"
+  "fl_dart_project.h"
+  "fl_engine.h"
+  "fl_json_message_codec.h"
+  "fl_json_method_codec.h"
+  "fl_message_codec.h"
+  "fl_method_call.h"
+  "fl_method_channel.h"
+  "fl_method_codec.h"
+  "fl_method_response.h"
+  "fl_plugin_registrar.h"
+  "fl_plugin_registry.h"
+  "fl_standard_message_codec.h"
+  "fl_standard_method_codec.h"
+  "fl_string_codec.h"
+  "fl_value.h"
+  "fl_view.h"
+  "flutter_linux.h"
+)
+list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/")
+add_library(flutter INTERFACE)
+target_include_directories(flutter INTERFACE
+  "${EPHEMERAL_DIR}"
+)
+target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}")
+target_link_libraries(flutter INTERFACE
+  PkgConfig::GTK
+  PkgConfig::GLIB
+  PkgConfig::GIO
+)
+add_dependencies(flutter flutter_assemble)
+
+# === Flutter tool backend ===
+# _phony_ is a non-existent file to force this command to run every time,
+# since currently there's no way to get a full input/output list from the
+# flutter tool.
+add_custom_command(
+  OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/_phony_
+  COMMAND ${CMAKE_COMMAND} -E env
+    ${FLUTTER_TOOL_ENVIRONMENT}
+    "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh"
+      ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE}
+  VERBATIM
+)
+add_custom_target(flutter_assemble DEPENDS
+  "${FLUTTER_LIBRARY}"
+  ${FLUTTER_LIBRARY_HEADERS}
+)
diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc
new file mode 100644
index 0000000..e71a16d
--- /dev/null
+++ b/example/linux/flutter/generated_plugin_registrant.cc
@@ -0,0 +1,11 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#include "generated_plugin_registrant.h"
+
+
+void fl_register_plugins(FlPluginRegistry* registry) {
+}
diff --git a/example/linux/flutter/generated_plugin_registrant.h b/example/linux/flutter/generated_plugin_registrant.h
new file mode 100644
index 0000000..e0f0a47
--- /dev/null
+++ b/example/linux/flutter/generated_plugin_registrant.h
@@ -0,0 +1,15 @@
+//
+//  Generated file. Do not edit.
+//
+
+// clang-format off
+
+#ifndef GENERATED_PLUGIN_REGISTRANT_
+#define GENERATED_PLUGIN_REGISTRANT_
+
+#include <flutter_linux/flutter_linux.h>
+
+// Registers Flutter plugins.
+void fl_register_plugins(FlPluginRegistry* registry);
+
+#endif  // GENERATED_PLUGIN_REGISTRANT_
diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake
new file mode 100644
index 0000000..2e1de87
--- /dev/null
+++ b/example/linux/flutter/generated_plugins.cmake
@@ -0,0 +1,23 @@
+#
+# Generated file, do not edit.
+#
+
+list(APPEND FLUTTER_PLUGIN_LIST
+)
+
+list(APPEND FLUTTER_FFI_PLUGIN_LIST
+)
+
+set(PLUGIN_BUNDLED_LIBRARIES)
+
+foreach(plugin ${FLUTTER_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
+  target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
+endforeach(plugin)
+
+foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
+  add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
+  list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
+endforeach(ffi_plugin)
diff --git a/example/linux/main.cc b/example/linux/main.cc
new file mode 100644
index 0000000..e7c5c54
--- /dev/null
+++ b/example/linux/main.cc
@@ -0,0 +1,6 @@
+#include "my_application.h"
+
+int main(int argc, char** argv) {
+  g_autoptr(MyApplication) app = my_application_new();
+  return g_application_run(G_APPLICATION(app), argc, argv);
+}
diff --git a/example/linux/my_application.cc b/example/linux/my_application.cc
new file mode 100644
index 0000000..0ba8f43
--- /dev/null
+++ b/example/linux/my_application.cc
@@ -0,0 +1,104 @@
+#include "my_application.h"
+
+#include <flutter_linux/flutter_linux.h>
+#ifdef GDK_WINDOWING_X11
+#include <gdk/gdkx.h>
+#endif
+
+#include "flutter/generated_plugin_registrant.h"
+
+struct _MyApplication {
+  GtkApplication parent_instance;
+  char** dart_entrypoint_arguments;
+};
+
+G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION)
+
+// Implements GApplication::activate.
+static void my_application_activate(GApplication* application) {
+  MyApplication* self = MY_APPLICATION(application);
+  GtkWindow* window =
+      GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
+
+  // Use a header bar when running in GNOME as this is the common style used
+  // by applications and is the setup most users will be using (e.g. Ubuntu
+  // desktop).
+  // If running on X and not using GNOME then just use a traditional title bar
+  // in case the window manager does more exotic layout, e.g. tiling.
+  // If running on Wayland assume the header bar will work (may need changing
+  // if future cases occur).
+  gboolean use_header_bar = TRUE;
+#ifdef GDK_WINDOWING_X11
+  GdkScreen* screen = gtk_window_get_screen(window);
+  if (GDK_IS_X11_SCREEN(screen)) {
+    const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen);
+    if (g_strcmp0(wm_name, "GNOME Shell") != 0) {
+      use_header_bar = FALSE;
+    }
+  }
+#endif
+  if (use_header_bar) {
+    GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
+    gtk_widget_show(GTK_WIDGET(header_bar));
+    gtk_header_bar_set_title(header_bar, "example");
+    gtk_header_bar_set_show_close_button(header_bar, TRUE);
+    gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
+  } else {
+    gtk_window_set_title(window, "example");
+  }
+
+  gtk_window_set_default_size(window, 1280, 720);
+  gtk_widget_show(GTK_WIDGET(window));
+
+  g_autoptr(FlDartProject) project = fl_dart_project_new();
+  fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments);
+
+  FlView* view = fl_view_new(project);
+  gtk_widget_show(GTK_WIDGET(view));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+
+  fl_register_plugins(FL_PLUGIN_REGISTRY(view));
+
+  gtk_widget_grab_focus(GTK_WIDGET(view));
+}
+
+// Implements GApplication::local_command_line.
+static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) {
+  MyApplication* self = MY_APPLICATION(application);
+  // Strip out the first argument as it is the binary name.
+  self->dart_entrypoint_arguments = g_strdupv(*arguments + 1);
+
+  g_autoptr(GError) error = nullptr;
+  if (!g_application_register(application, nullptr, &error)) {
+     g_warning("Failed to register: %s", error->message);
+     *exit_status = 1;
+     return TRUE;
+  }
+
+  g_application_activate(application);
+  *exit_status = 0;
+
+  return TRUE;
+}
+
+// Implements GObject::dispose.
+static void my_application_dispose(GObject* object) {
+  MyApplication* self = MY_APPLICATION(object);
+  g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev);
+  G_OBJECT_CLASS(my_application_parent_class)->dispose(object);
+}
+
+static void my_application_class_init(MyApplicationClass* klass) {
+  G_APPLICATION_CLASS(klass)->activate = my_application_activate;
+  G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
+  G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
+}
+
+static void my_application_init(MyApplication* self) {}
+
+MyApplication* my_application_new() {
+  return MY_APPLICATION(g_object_new(my_application_get_type(),
+                                     "application-id", APPLICATION_ID,
+                                     "flags", G_APPLICATION_NON_UNIQUE,
+                                     nullptr));
+}
diff --git a/example/linux/my_application.h b/example/linux/my_application.h
new file mode 100644
index 0000000..72271d5
--- /dev/null
+++ b/example/linux/my_application.h
@@ -0,0 +1,18 @@
+#ifndef FLUTTER_MY_APPLICATION_H_
+#define FLUTTER_MY_APPLICATION_H_
+
+#include <gtk/gtk.h>
+
+G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION,
+                     GtkApplication)
+
+/**
+ * my_application_new:
+ *
+ * Creates a new Flutter-based application.
+ *
+ * Returns: a new #MyApplication.
+ */
+MyApplication* my_application_new();
+
+#endif  // FLUTTER_MY_APPLICATION_H_
diff --git a/example/pubspec.lock b/example/pubspec.lock
index aecadfe..d62533c 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -5,58 +5,58 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: caac504f942f41dfadcf45229ce8c47065b93919a12739f20d6173a883c5ec73
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -67,27 +67,46 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.15"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -97,64 +116,64 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
+    version: "0.5.1"
   touchable:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "1.0.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
index a92c6d7..91d23d5 100644
--- a/example/test/widget_test.dart
+++ b/example/test/widget_test.dart
@@ -5,10 +5,7 @@
 // gestures. You can also use WidgetTester to find child widgets in the widget
 // tree, read text, and verify that the values of widget properties are correct.
 
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
 
-import 'package:example/main.dart';
 
 void main() {
 }
diff --git a/lib/src/shape_handler.dart b/lib/src/shape_handler.dart
index ac6a8fd..75f2ae1 100644
--- a/lib/src/shape_handler.dart
+++ b/lib/src/shape_handler.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/clip.dart';
diff --git a/lib/src/shapes/arc.dart b/lib/src/shapes/arc.dart
index 87592a8..4a00883 100644
--- a/lib/src/shapes/arc.dart
+++ b/lib/src/shapes/arc.dart
@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:touchable/src/shapes/constant.dart';
diff --git a/lib/src/shapes/circle.dart b/lib/src/shapes/circle.dart
index 61ef9a2..70845d8 100644
--- a/lib/src/shapes/circle.dart
+++ b/lib/src/shapes/circle.dart
@@ -14,9 +14,14 @@ class Circle extends Shape {
       {required this.center,
       required this.radius,
       HitTestBehavior? hitTestBehavior,
+      StrokeHitBehavior? strokeHitBehavior,
       Map<GestureType, Function>? gestureMap,
       Paint? paint})
-      : super(paint: paint, gestureCallbackMap: gestureMap, hitTestBehavior: hitTestBehavior);
+      : super(
+            paint: paint,
+            gestureCallbackMap: gestureMap,
+            hitTestBehavior: hitTestBehavior,
+            strokeHitBehavior: strokeHitBehavior);
 
 //   (x-a)^2 + (y-b)^2 = r^2
   @override
@@ -26,12 +31,20 @@ class Circle extends Shape {
     } else {
       double extraWidth = paint.strokeWidth / 2;
       bool insideOuterCircle = _isInsideRadius(p, radius + extraWidth);
+
+      if (strokeHitBehavior == StrokeHitBehavior.withinBounds) {
+        return insideOuterCircle;
+      }
+
       bool outsideInnerCircle = !_isInsideRadius(p, radius - extraWidth);
       return insideOuterCircle && outsideInnerCircle;
     }
   }
 
   bool _isInsideRadius(Offset p, double radius) {
-    return pow(p.dx - center.dx, 2) + pow(p.dy - center.dy, 2) - pow(radius, 2) <= ShapeConstant.floatPrecision;
+    return pow(p.dx - center.dx, 2) +
+            pow(p.dy - center.dy, 2) -
+            pow(radius, 2) <=
+        ShapeConstant.floatPrecision;
   }
 }
diff --git a/lib/src/shapes/clip.dart b/lib/src/shapes/clip.dart
index 37ebdf7..69a3119 100644
--- a/lib/src/shapes/clip.dart
+++ b/lib/src/shapes/clip.dart
@@ -1,6 +1,5 @@
 import 'dart:ui';
 
-import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/shape.dart';
 
 abstract class ClipShape extends Shape {
diff --git a/lib/src/shapes/oval.dart b/lib/src/shapes/oval.dart
index ec063a6..a25a817 100644
--- a/lib/src/shapes/oval.dart
+++ b/lib/src/shapes/oval.dart
@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/constant.dart';
@@ -16,20 +15,33 @@ class Oval extends Shape {
       {Map<GestureType, Function>? gestureMap,
       Paint? paint,
       HitTestBehavior? hitTestBehavior,
+      StrokeHitBehavior? strokeHitBehavior,
       PaintingStyle? paintStyleForTouch})
       : a = rect.right - rect.center.dx,
         b = rect.center.dy - rect.top,
-        super(hitTestBehavior: hitTestBehavior, paint: paint ?? Paint(), gestureCallbackMap: gestureMap ?? {});
+        super(
+            hitTestBehavior: hitTestBehavior,
+            strokeHitBehavior: strokeHitBehavior,
+            paint: paint ?? Paint(),
+            gestureCallbackMap: gestureMap ?? {});
 
   @override
   bool isInside(Offset p) {
     if (a == 0 || b == 0) return false;
 
-    var extraWidth = paint.style == PaintingStyle.stroke ? paint.strokeWidth / 2 : ShapeConstant.floatPrecision;
+    var extraWidth = paint.style == PaintingStyle.stroke
+        ? paint.strokeWidth / 2
+        : ShapeConstant.floatPrecision;
 
     bool insideOuterOval = _isInsideOval(p, extraWidth);
+
     if (paint.style == PaintingStyle.stroke) {
       bool outsideInnerOval = !_isInsideOval(p, -extraWidth);
+
+      if (strokeHitBehavior == StrokeHitBehavior.withinBounds) {
+        return insideOuterOval;
+      }
+
       return insideOuterOval && outsideInnerOval;
     } else {
       return insideOuterOval;
@@ -43,7 +55,9 @@ class Oval extends Shape {
   }
 
   bool isOnTheOval(Offset p) {
-    var extraWidth = paint.style == PaintingStyle.stroke ? paint.strokeWidth / 2 : ShapeConstant.floatPrecision;
+    var extraWidth = paint.style == PaintingStyle.stroke
+        ? paint.strokeWidth / 2
+        : ShapeConstant.floatPrecision;
     bool insideOuterOval = _isInsideOval(p, extraWidth);
     bool outsideInnerOval = !_isInsideOval(p, -extraWidth);
     return insideOuterOval && outsideInnerOval;
diff --git a/lib/src/shapes/path.dart b/lib/src/shapes/path.dart
index 50fb6a8..971a2bf 100644
--- a/lib/src/shapes/path.dart
+++ b/lib/src/shapes/path.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/shape.dart';
 import 'package:touchable/src/types/types.dart';
@@ -12,7 +10,10 @@ class PathShape extends Shape {
       required Paint paint,
       HitTestBehavior? hitTestBehavior,
       PaintingStyle? paintStyleForTouch})
-      : super(hitTestBehavior: hitTestBehavior, paint: paint, gestureCallbackMap: gestureMap);
+      : super(
+            hitTestBehavior: hitTestBehavior,
+            paint: paint,
+            gestureCallbackMap: gestureMap);
 
   @override
   bool isInside(Offset p) {
diff --git a/lib/src/shapes/point.dart b/lib/src/shapes/point.dart
index d5c680e..3f39bcc 100644
--- a/lib/src/shapes/point.dart
+++ b/lib/src/shapes/point.dart
@@ -15,8 +15,13 @@ class Point extends Shape {
       {Map<GestureType, Function>? gestureMap,
       Paint? paint,
       HitTestBehavior? hitTestBehavior,
+      StrokeHitBehavior? strokeHitBehavior,
       PaintingStyle? paintStyleForTouch})
-      : super(hitTestBehavior: hitTestBehavior, paint: paint ?? Paint(), gestureCallbackMap: gestureMap ?? {});
+      : super(
+            hitTestBehavior: hitTestBehavior,
+            strokeHitBehavior: strokeHitBehavior,
+            paint: paint ?? Paint(),
+            gestureCallbackMap: gestureMap ?? {});
 
   @override
   bool isInside(Offset p) {
@@ -35,12 +40,19 @@ class Point extends Shape {
         }
         return false;
       case PointMode.polygon:
+        bool isOnLines = false;
         for (int i = 1; i < points.length; i += 1) {
           if (Line(points[i - 1], points[i], paint: paint).isInside(p)) {
-            return true;
+            isOnLines = true;
+            break;
           }
         }
-        return false;
+
+        if (strokeHitBehavior == StrokeHitBehavior.withinBounds) {
+          return isOnLines || PolygonUtil.checkInside(points, p);
+        }
+
+        return isOnLines;
       default:
         return false;
     }
@@ -52,7 +64,9 @@ class Point extends Shape {
     if (paint.strokeCap == StrokeCap.round) {
       return Circle(center: point, radius: extraWidth).isInside(queryPoint);
     } else {
-      return Rect.fromCenter(center: point, width: extraWidth * 2, height: extraWidth * 2).contains(queryPoint);
+      return Rect.fromCenter(
+              center: point, width: extraWidth * 2, height: extraWidth * 2)
+          .contains(queryPoint);
     }
   }
 }
@@ -76,28 +90,37 @@ class PolygonUtil {
     int dir4 = _direction(l2.p1, l2.p2, l1.p2);
 
     if (dir1 != dir2 && dir3 != dir4) return true; //they are intersecting
-    if (dir1 == 0 && l1.isInside(l2.p1)) //when p2 of line2 are on the line1
+    if (dir1 == 0 && l1.isInside(l2.p1)) {
+      //when p2 of line2 are on the line1
       return true;
-    if (dir2 == 0 && l1.isInside(l2.p2)) //when p1 of line2 are on the line1
+    }
+    if (dir2 == 0 && l1.isInside(l2.p2)) {
+      //when p1 of line2 are on the line1
       return true;
-    if (dir3 == 0 && l2.isInside(l1.p1)) //when p2 of line1 are on the line2
+    }
+    if (dir3 == 0 && l2.isInside(l1.p1)) {
+      //when p2 of line1 are on the line2
       return true;
-    if (dir4 == 0 && l2.isInside(l1.p2)) //when p1 of line1 are on the line2
+    }
+    if (dir4 == 0 && l2.isInside(l1.p2)) {
+      //when p1 of line1 are on the line2
       return true;
+    }
     return false;
   }
 
-  static bool checkInside(List<Offset> poly, Offset p, Paint paint) {
+  static bool checkInside(List<Offset> poly, Offset p) {
     int n = poly.length;
     if (n < 3) {
       return false;
     } //when polygon has less than 3 edge, it is not polygon
-    Line exline = Line(p, Offset(9999, p.dy)); //create a point at infinity, y is same as point p
+    Line exline = Line(p,
+        Offset(9999, p.dy)); //create a point at infinity, y is same as point p
     int count = 0;
     int i = 0;
     do {
       //forming a line from two consecutive points of poly
-      Line side = Line(poly[i], poly[(i + 1) % n], paint: paint);
+      Line side = Line(poly[i], poly[(i + 1) % n]);
       if (_isIntersect(side, exline)) {
         //if side is intersects exline
         if (_direction(side.p1, p, side.p2) == 0) return side.isInside(p);
diff --git a/lib/src/shapes/rectangle.dart b/lib/src/shapes/rectangle.dart
index e271f13..4fd4db5 100644
--- a/lib/src/shapes/rectangle.dart
+++ b/lib/src/shapes/rectangle.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/shape.dart';
 import 'package:touchable/src/types/types.dart';
@@ -11,8 +9,13 @@ class Rectangle extends Shape {
       {Map<GestureType, Function>? gestureMap,
       Paint? paint,
       HitTestBehavior? hitTestBehavior,
+      StrokeHitBehavior? strokeHitBehavior,
       PaintingStyle? paintStyleForTouch})
-      : super(hitTestBehavior: hitTestBehavior, paint: paint ?? Paint(), gestureCallbackMap: gestureMap ?? {});
+      : super(
+            hitTestBehavior: hitTestBehavior,
+            strokeHitBehavior: strokeHitBehavior,
+            paint: paint ?? Paint(),
+            gestureCallbackMap: gestureMap ?? {});
 
   @override
   bool isInside(Offset p) {
@@ -22,12 +25,23 @@ class Rectangle extends Shape {
       double extraWidth = paint.strokeWidth / 2;
 
       bool insideOuterRect = Rect.fromLTRB(
-              rect.left - extraWidth, rect.top - extraWidth, rect.right + extraWidth, rect.bottom + extraWidth)
+              rect.left - extraWidth,
+              rect.top - extraWidth,
+              rect.right + extraWidth,
+              rect.bottom + extraWidth)
           .contains(p);
 
       bool outsideInnerRect = !Rect.fromLTRB(
-              rect.left + extraWidth, rect.top + extraWidth, rect.right - extraWidth, rect.bottom - extraWidth)
+              rect.left + extraWidth,
+              rect.top + extraWidth,
+              rect.right - extraWidth,
+              rect.bottom - extraWidth)
           .contains(p);
+
+      if (strokeHitBehavior == StrokeHitBehavior.withinBounds) {
+        return insideOuterRect;
+      }
+
       return insideOuterRect && outsideInnerRect;
     }
   }
diff --git a/lib/src/shapes/rounded_rectangle.dart b/lib/src/shapes/rounded_rectangle.dart
index fe658e3..69761ab 100644
--- a/lib/src/shapes/rounded_rectangle.dart
+++ b/lib/src/shapes/rounded_rectangle.dart
@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 import 'package:touchable/src/shapes/shape.dart';
 import 'package:touchable/src/types/types.dart';
@@ -11,8 +9,13 @@ class RoundedRectangle extends Shape {
       {Paint? paint,
       Map<GestureType, Function>? gestureMap,
       HitTestBehavior? hitTestBehavior,
+      StrokeHitBehavior? strokeHitBehavior,
       PaintingStyle? paintStyleForTouch})
-      : super(hitTestBehavior: hitTestBehavior, paint: paint ?? Paint(), gestureCallbackMap: gestureMap ?? {});
+      : super(
+            hitTestBehavior: hitTestBehavior,
+            strokeHitBehavior: strokeHitBehavior,
+            paint: paint ?? Paint(),
+            gestureCallbackMap: gestureMap ?? {});
 
   @override
   bool isInside(Offset p) {
@@ -25,21 +28,33 @@ class RoundedRectangle extends Shape {
         rRect.top - extraWidth,
         rRect.right + extraWidth,
         rRect.bottom + extraWidth,
-        topLeft: Radius.elliptical(rRect.tlRadiusX + extraWidth, rRect.tlRadiusY + extraWidth),
-        topRight: Radius.elliptical(rRect.trRadiusX + extraWidth, rRect.trRadiusY + extraWidth),
-        bottomLeft: Radius.elliptical(rRect.blRadiusX + extraWidth, rRect.blRadiusY + extraWidth),
-        bottomRight: Radius.elliptical(rRect.brRadiusX + extraWidth, rRect.brRadiusY + extraWidth),
+        topLeft: Radius.elliptical(
+            rRect.tlRadiusX + extraWidth, rRect.tlRadiusY + extraWidth),
+        topRight: Radius.elliptical(
+            rRect.trRadiusX + extraWidth, rRect.trRadiusY + extraWidth),
+        bottomLeft: Radius.elliptical(
+            rRect.blRadiusX + extraWidth, rRect.blRadiusY + extraWidth),
+        bottomRight: Radius.elliptical(
+            rRect.brRadiusX + extraWidth, rRect.brRadiusY + extraWidth),
       ).contains(p);
       bool outsideInnerRect = !RRect.fromLTRBAndCorners(
         rRect.left + extraWidth,
         rRect.top + extraWidth,
         rRect.right - extraWidth,
         rRect.bottom - extraWidth,
-        topLeft: Radius.elliptical(rRect.tlRadiusX - extraWidth, rRect.tlRadiusY - extraWidth),
-        topRight: Radius.elliptical(rRect.trRadiusX - extraWidth, rRect.trRadiusY - extraWidth),
-        bottomLeft: Radius.elliptical(rRect.blRadiusX - extraWidth, rRect.blRadiusY - extraWidth),
-        bottomRight: Radius.elliptical(rRect.brRadiusX - extraWidth, rRect.brRadiusY - extraWidth),
+        topLeft: Radius.elliptical(
+            rRect.tlRadiusX - extraWidth, rRect.tlRadiusY - extraWidth),
+        topRight: Radius.elliptical(
+            rRect.trRadiusX - extraWidth, rRect.trRadiusY - extraWidth),
+        bottomLeft: Radius.elliptical(
+            rRect.blRadiusX - extraWidth, rRect.blRadiusY - extraWidth),
+        bottomRight: Radius.elliptical(
+            rRect.brRadiusX - extraWidth, rRect.brRadiusY - extraWidth),
       ).contains(p);
+
+      if (strokeHitBehavior == StrokeHitBehavior.withinBounds) {
+        return insideOuterRect;
+      }
       return insideOuterRect && outsideInnerRect;
     }
   }
diff --git a/lib/src/shapes/shape.dart b/lib/src/shapes/shape.dart
index 0861cc9..359690b 100644
--- a/lib/src/shapes/shape.dart
+++ b/lib/src/shapes/shape.dart
@@ -1,6 +1,3 @@
-import 'dart:ui';
-
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:touchable/src/shapes/constant.dart';
 import 'package:touchable/touchable.dart';
@@ -9,6 +6,7 @@ abstract class Shape {
   final Paint paint;
   final Map<GestureType, Function> gestureCallbackMap;
   final HitTestBehavior hitTestBehavior;
+  final StrokeHitBehavior strokeHitBehavior;
 
   Set<GestureType> get registeredGestures => gestureCallbackMap.keys.toSet();
 
@@ -16,12 +14,14 @@ abstract class Shape {
     Paint? paint,
     Map<GestureType, Function>? gestureCallbackMap,
     HitTestBehavior? hitTestBehavior,
+    StrokeHitBehavior? strokeHitBehavior,
   })  : paint = paint ??
             (Paint()
               ..strokeWidth = ShapeConstant.floatPrecision
               ..style = PaintingStyle.fill),
         gestureCallbackMap = gestureCallbackMap ?? {},
-        hitTestBehavior = hitTestBehavior ?? HitTestBehavior.opaque {
+        hitTestBehavior = hitTestBehavior ?? HitTestBehavior.opaque,
+        strokeHitBehavior = strokeHitBehavior ?? StrokeHitBehavior.onlyOnPaint {
     if (this.paint.strokeWidth == 0) {
       this.paint.strokeWidth = ShapeConstant.floatPrecision;
     }
@@ -31,7 +31,8 @@ abstract class Shape {
 
   Function getCallbackFromGesture(Gesture gesture) {
     if (gestureCallbackMap.containsKey(gesture.gestureType)) {
-      return () => gestureCallbackMap[gesture.gestureType]?.call(gesture.gestureDetail);
+      return () =>
+          gestureCallbackMap[gesture.gestureType]?.call(gesture.gestureDetail);
     } else {
       return () {};
     }
diff --git a/lib/src/shapes/util.dart b/lib/src/shapes/util.dart
index bcd96dc..371338b 100644
--- a/lib/src/shapes/util.dart
+++ b/lib/src/shapes/util.dart
@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:touchable/src/types/types.dart';
@@ -38,7 +37,7 @@ class TouchCanvasUtil {
       case ForcePressDetails:
         return (gestureDetail as ForcePressDetails).localPosition;
       default:
-        throw Exception("gestureDetail.runTimeType = ${gestureDetail.runtimeType} is not recognized ! ");
+        throw Exception('gestureDetail.runTimeType = ${gestureDetail.runtimeType} is not recognized ! ');
     }
   }
 
diff --git a/lib/src/touchy_canvas.dart b/lib/src/touchy_canvas.dart
index b674e06..fa23af8 100644
--- a/lib/src/touchy_canvas.dart
+++ b/lib/src/touchy_canvas.dart
@@ -1,8 +1,6 @@
-import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui';
 
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart' hide Image;
 import 'package:touchable/src/canvas_touch_detector.dart';
 import 'package:touchable/src/shape_handler.dart';
@@ -16,6 +14,7 @@ import 'package:touchable/src/shapes/point.dart';
 import 'package:touchable/src/shapes/rectangle.dart';
 import 'package:touchable/src/shapes/rounded_rectangle.dart';
 import 'package:touchable/src/shapes/util.dart';
+import 'package:touchable/src/types/types.dart';
 
 class TouchyCanvas {
   final Canvas _canvas;
@@ -52,7 +51,8 @@ class TouchyCanvas {
     _shapeHandler.addShape(ClipRRectShape(rrect));
   }
 
-  void clipRect(Rect rect, {ClipOp clipOp = ClipOp.intersect, bool doAntiAlias = true}) {
+  void clipRect(Rect rect,
+      {ClipOp clipOp = ClipOp.intersect, bool doAntiAlias = true}) {
     _canvas.clipRect(rect, clipOp: clipOp, doAntiAlias: doAntiAlias);
     _shapeHandler.addShape(ClipRectShape(rect, clipOp: clipOp));
   }
@@ -62,6 +62,7 @@ class TouchyCanvas {
     double radius,
     Paint paint, {
     HitTestBehavior? hitTestBehavior,
+    StrokeHitBehavior? strokeHitBehavior,
     GestureTapDownCallback? onTapDown,
     GestureTapUpCallback? onTapUp,
     GestureLongPressStartCallback? onLongPressStart,
@@ -83,6 +84,7 @@ class TouchyCanvas {
         radius: radius,
         paint: paint,
         hitTestBehavior: hitTestBehavior,
+        strokeHitBehavior: strokeHitBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
           onTapDown: onTapDown,
           onTapUp: onTapUp,
@@ -148,6 +150,7 @@ class TouchyCanvas {
     Rect rect,
     Paint paint, {
     HitTestBehavior? hitTestBehavior,
+    StrokeHitBehavior? strokeHitBehavior,
     GestureTapDownCallback? onTapDown,
     PaintingStyle? paintStyleForTouch,
     GestureTapUpCallback? onTapUp,
@@ -168,6 +171,7 @@ class TouchyCanvas {
     _shapeHandler.addShape(Oval(rect,
         paint: paint,
         hitTestBehavior: hitTestBehavior,
+        strokeHitBehavior: strokeHitBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
           onTapDown: onTapDown,
           onTapUp: onTapUp,
@@ -239,6 +243,9 @@ class TouchyCanvas {
     List<Offset> points,
     Paint paint, {
     HitTestBehavior? hitTestBehavior,
+
+    /// Only applies when [pointMode] is [PointMode.polygon]
+    StrokeHitBehavior? strokeHitBehavior,
     GestureTapDownCallback? onTapDown,
     PaintingStyle? paintStyleForTouch,
     GestureTapUpCallback? onTapUp,
@@ -259,6 +266,7 @@ class TouchyCanvas {
     _shapeHandler.addShape(Point(pointMode, points,
         paint: paint,
         hitTestBehavior: hitTestBehavior,
+        strokeHitBehavior: strokeHitBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
           onTapDown: onTapDown,
           onTapUp: onTapUp,
@@ -281,6 +289,7 @@ class TouchyCanvas {
     RRect rrect,
     Paint paint, {
     HitTestBehavior? hitTestBehavior,
+    StrokeHitBehavior? strokeHitBehavior,
     GestureTapDownCallback? onTapDown,
     PaintingStyle? paintStyleForTouch,
     GestureTapUpCallback? onTapUp,
@@ -301,6 +310,7 @@ class TouchyCanvas {
     _shapeHandler.addShape(RoundedRectangle(rrect,
         paint: paint,
         hitTestBehavior: hitTestBehavior,
+        strokeHitBehavior: strokeHitBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
           onTapDown: onTapDown,
           onTapUp: onTapUp,
@@ -370,6 +380,7 @@ class TouchyCanvas {
     Rect rect,
     Paint paint, {
     HitTestBehavior? hitTestBehavior,
+    StrokeHitBehavior? strokeHitBehavior,
     GestureTapDownCallback? onTapDown,
     PaintingStyle? paintStyleForTouch,
     GestureTapUpCallback? onTapUp,
@@ -390,6 +401,7 @@ class TouchyCanvas {
     _shapeHandler.addShape(Rectangle(rect,
         paint: paint,
         hitTestBehavior: hitTestBehavior,
+        strokeHitBehavior: strokeHitBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
           onTapDown: onTapDown,
           onTapUp: onTapUp,
@@ -408,7 +420,8 @@ class TouchyCanvas {
         )));
   }
 
-  void drawShadow(Path path, Color color, double elevation, bool transparentOccluder) {
+  void drawShadow(
+      Path path, Color color, double elevation, bool transparentOccluder) {
     _canvas.drawShadow(path, color, elevation, transparentOccluder);
     // _shapeHandler.addShape(PathShape(path));
   }
@@ -435,7 +448,9 @@ class TouchyCanvas {
     GestureTapUpCallback? onSecondaryTapUp,
   }) {
     _canvas.drawImage(image, p, paint);
-    _shapeHandler.addShape(Rectangle(Rect.fromLTWH(p.dx, p.dy, image.width.toDouble(), image.height.toDouble()),
+    _shapeHandler.addShape(Rectangle(
+        Rect.fromLTWH(
+            p.dx, p.dy, image.width.toDouble(), image.height.toDouble()),
         paint: paint,
         hitTestBehavior: hitTestBehavior,
         gestureMap: TouchCanvasUtil.getGestureCallbackMap(
diff --git a/lib/src/types/types.dart b/lib/src/types/types.dart
index ff2476a..3459e6a 100644
--- a/lib/src/types/types.dart
+++ b/lib/src/types/types.dart
@@ -42,3 +42,13 @@ enum GestureType {
   onSecondaryTapDown,
   onSecondaryTapUp,
 }
+
+/// Changes how [PaintingStyle.stroke] affects hit behavior
+enum StrokeHitBehavior {
+  /// A hit is recorded only when the point actually touches the painted area
+  onlyOnPaint,
+
+  /// A hit is recorded when the point is within the bounds of the painted
+  /// shape, even if that area is actually transparent
+  withinBounds
+}
diff --git a/pubspec.lock b/pubspec.lock
index ad6d1df..f15e892 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,51 +5,50 @@ packages:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.6.1"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.15.0"
+    version: "1.17.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -60,27 +59,46 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  js:
+    dependency: transitive
+    description:
+      name: js
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.7"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.15"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.9.1"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -90,57 +108,57 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
+      url: "https://pub.dev"
     source: hosted
-    version: "0.3.0"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.0"
+    version: "0.5.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.4"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=3.0.0-0 <4.0.0"
diff --git a/test/shapes/arc.dart b/test/shapes/arc.dart
index ff052f0..429fdf9 100644
--- a/test/shapes/arc.dart
+++ b/test/shapes/arc.dart
@@ -1,6 +1,5 @@
 import 'dart:math';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:touchable/src/shapes/arc.dart';
@@ -45,7 +44,7 @@ void testArc() {
     expect(arc2.isInside(Offset(227.0, 113.1)), true);
   });
 
-  test("Arc with sweep greather than 360 degree test", () {
+  test('Arc with sweep greather than 360 degree test', () {
     var arc3 =
         Arc(Rect.fromLTWH(100, 100, 200, 200), 3 * pi / 2, -10 * pi / 3, false,
             paint: Paint()
diff --git a/test/shapes/line.dart b/test/shapes/line.dart
index 96382c2..cc0d20b 100644
--- a/test/shapes/line.dart
+++ b/test/shapes/line.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/shapes/point.dart b/test/shapes/point.dart
index 2f43421..7d14aad 100644
--- a/test/shapes/point.dart
+++ b/test/shapes/point.dart
@@ -1,6 +1,5 @@
 import 'dart:ui';
 
-import 'package:flutter/cupertino.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:touchable/src/shapes/point.dart';
 
diff --git a/test/shapes/rectangle.dart b/test/shapes/rectangle.dart
index 37db25e..e626762 100644
--- a/test/shapes/rectangle.dart
+++ b/test/shapes/rectangle.dart
@@ -1,4 +1,3 @@
-import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';