diff --git a/libraries/pico_vector/pico_vector.cpp b/libraries/pico_vector/pico_vector.cpp index a12e0183..5c36238d 100644 --- a/libraries/pico_vector/pico_vector.cpp +++ b/libraries/pico_vector/pico_vector.cpp @@ -3,6 +3,7 @@ namespace pimoroni { void PicoVector::polygon(std::vector> contours, Point origin, int scale) { + pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h}; pretty_poly::draw_polygon( contours, pretty_poly::point_t(origin.x, origin.y), @@ -50,6 +51,8 @@ namespace pimoroni { } Point PicoVector::text(std::string_view text, Point origin) { + // Copy clipping bounds from the PicoGraphics instance + pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h}; // TODO: Normalize types somehow, so we're not converting? pretty_poly::point_t caret = pretty_poly::point_t(origin.x, origin.y); @@ -109,6 +112,8 @@ namespace pimoroni { } Point PicoVector::text(std::string_view text, Point origin, float angle) { + // Copy clipping bounds from the PicoGraphics instance + pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h}; // TODO: Normalize types somehow, so we're not converting? pretty_poly::point_t caret(0, 0); diff --git a/libraries/pico_vector/pico_vector.hpp b/libraries/pico_vector/pico_vector.hpp index 41bfccbc..8502e5fb 100644 --- a/libraries/pico_vector/pico_vector.hpp +++ b/libraries/pico_vector/pico_vector.hpp @@ -50,7 +50,7 @@ namespace pimoroni { tile_data += tile.stride - tile.bounds.w; } } - }, graphics->supports_alpha_blend() ? pretty_poly::X4 : pretty_poly::NONE, {0, 0, graphics->bounds.w, graphics->bounds.h}); + }, graphics->supports_alpha_blend() ? pretty_poly::X4 : pretty_poly::NONE, {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h}); } void set_antialiasing(pretty_poly::antialias_t antialias) {