惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

博客园_首页
博客园 - Franky
大猫的无限游戏
大猫的无限游戏
博客园 - 三生石上(FineUI控件)
量子位
博客园 - 聂微东
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
S
SegmentFault 最新的问题
Apple Machine Learning Research
Apple Machine Learning Research
爱范儿
爱范儿
V
Visual Studio Blog
雷峰网
雷峰网
T
Tailwind CSS Blog
宝玉的分享
宝玉的分享
Blog — PlanetScale
Blog — PlanetScale
有赞技术团队
有赞技术团队
博客园 - 叶小钗
Microsoft Azure Blog
Microsoft Azure Blog
T
The Blog of Author Tim Ferriss
U
Unit 42
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
小众软件
小众软件
阮一峰的网络日志
阮一峰的网络日志
Y
Y Combinator Blog

Martin Owens activity

Martin Owens deleted project branch average-color-divide at Inkscape / inkscape Fix divide-by-zero crash when using calligraphy tool (!7923) · Merge requests · Inkscape / inkscape · GitLab Add selection file to bypass Windows command length limits (correction) (865df7a5) · Commits · Inkscape / inkscape · GitLab Draft: Fix AppImage crashing during save on older distros (!7922) · Merge requests · Inkscape / inkscape · GitLab e71fa7f8e0858aab87b7fc0814a30a8c88da9b43 to fe225a6b9e1042c7221d95173be22a02b3725337 · Martin Owens / inkscape · GitLab 403 Forbidden on Inkscape web server (#693) · Issues · Inkscape / inkscape-web · GitLab 403 Forbidden on Inkscape web server (#13509) · Issues · Inkscape / Inbox · GitLab Add selection file to bypass Windows command length limits (correction) (!7917) · 合并请求 · Inkscape / inkscape · GitLab Non-vertical axonometric axis implementation (!7912) · Merge requests · Inkscape / inkscape · GitLab Update split mode on tab switch (!7915) · Merge requests · Inkscape / inkscape · GitLab inset/offset as app functions so they can be used from CLI (!7914) · Merge requests · Inkscape / inkscape · GitLab Performace regresion in last month (#5879) · Issues · Inkscape / inkscape · GitLab [Regression] Right-aligned text has a new gap in 1.4.4 (#6130) · Issues · Inkscape / inkscape · GitLab [Regression] Right-aligned text has a new gap in 1.4.4 (#13498) · Issues · Inkscape / Inbox · GitLab c503804e014994d611de1b225bee8158c06448a8 to a4588d8ead1e7049b90c5a126962746ed286ab17 · Inkscape / inkscape-web · GitLab Validate the extensions of signature file uploads (a4588d8e) · 提交 · Inkscape / inkscape-web · GitLab Allow color conversions using static arrays instead of just vectors (e71fa7f8) · 提交 · Martin Owens / inkscape · GitLab Speed up ungroup on thousands of items (!7908) · Merge requests · Inkscape / inkscape · GitLab Incorrect handling of FontMatrix and transformation matrices with internal PDF import (#4845) · Issues · Inkscape / inkscape · GitLab Handling edge case of negative fonts in PDF (59040229) · 提交 · Inkscape / inkscape · GitLab Handling edge case of negative fonts in PDF (!7911) · 合并请求 · Inkscape / inkscape · GitLab Allow color conversions using static arrays instead of just vectors (33e65d1b) · Commits · Martin Owens / inkscape · GitLab Allow color conversions using static arrays instead of just vectors (9be5f867) · Commits · Martin Owens / inkscape · GitLab a9672ea1dff483b5b3aa8c6b5d88cd223001bef5 to 512a5e57602ac52e1d35782a7dcebae04262b2b8 · Martin Owens / inkscape · GitLab Add selection file to bypass Windows command length limits (!7905) · 合并请求 · Inkscape / inkscape · GitLab Revert Pango label changes (1.4.x) (!7907) · 合并请求 · Inkscape / inkscape · GitLab Crash on selecting a `<text>` object without a `<tspan>` inside (#5462) · Issues · Inkscape / inkscape · GitLab Fix breakage with Ubuntu 26.04 CI (!7904) · 合并请求 · Inkscape / inkscape · GitLab c673fdd5148253276826d4eda3951daaefb82607 to 356b31383ba324396a225686613236484305533d · Martin Owens / inkscape · GitLab Revert Text tool cursor changes (1.4.x) (!7903) · 合并请求 · Inkscape / inkscape · GitLab
Remove use of CanvasItem to get the outline state of a Ca...
Martin Owens · 2026-06-26 · via Martin Owens activity
Commit 278ddfbb authored by Martin Owens's avatar Martin Owens 🕘
Browse files

Remove use of CanvasItem to get the outline state of a Canvas Widget

This clean up removes the way the document was using the canvas item drawing
as a state for the outline. This isn't needed per object since the input data
does not change between SPItem iterations.

The final bool can be given directly from SPDesktop. This leads the SPDocument
getItem API to be protected and only called from SPDesktop itself. There is
more future refactoring which should remove item picking from SPDocument.

This cleanup is needed for the new rendering engine work.
Original line number Diff line number Diff line
@@ -352,7 +352,8 @@ Inkscape::UI::Dialog::DialogContainer *SPDesktop::getContainer()
SPItem *SPDesktop::getItemFromListAtPointBottom(const std::vector<SPItem*> &list, Geom::Point const &p) const
{
    g_return_val_if_fail (doc() != nullptr, NULL);
    return SPDocument::getItemFromListAtPointBottom(dkey, doc()->getRoot(), list, p);
    bool outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
    return SPDocument::getItemFromListAtPointBottom(dkey, doc()->getRoot(), list, p, outline);
}

/**
@@ -361,14 +362,19 @@ SPItem *SPDesktop::getItemFromListAtPointBottom(const std::vector<SPItem*> &list
SPItem *SPDesktop::getItemAtPoint(Geom::Point const &p, bool into_groups, SPItem *upto) const
{
    g_return_val_if_fail (doc() != nullptr, NULL);
    return doc()->getItemAtPoint( dkey, p, into_groups, upto);
    bool outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
    return doc()->getItemAtPoint( dkey, p, into_groups, upto, outline);
}

std::vector<SPItem*> SPDesktop::getItemsAtPoints(std::vector<Geom::Point> points, bool all_layers, bool topmost_only, size_t limit, bool active_only) const
{
    if (!doc())
        return {};
    return doc()->getItemsAtPoints(dkey, points, all_layers, topmost_only, limit, active_only);
    bool outline = false;
    for (auto &p : points) {
        outline = outline || canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
    }
    return doc()->getItemsAtPoints(dkey, points, all_layers, topmost_only, limit, active_only, outline);
}

/**
@@ -377,7 +383,8 @@ std::vector<SPItem*> SPDesktop::getItemsAtPoints(std::vector<Geom::Point> points
SPItem *SPDesktop::getGroupAtPoint(Geom::Point const &p) const
{
    g_return_val_if_fail (doc() != nullptr, NULL);
    return doc()->getGroupAtPoint(dkey, p);
    bool outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
    return doc()->getGroupAtPoint(dkey, p, outline);
}

/**
Original line number Diff line number Diff line
@@ -1782,25 +1782,18 @@ static std::vector<SPItem*> &find_items_in_area(std::vector<SPItem*> &s,
    return s;
}

SPItem *SPDocument::getItemFromListAtPointBottom(unsigned dkey, SPGroup *group, std::vector<SPItem*> const &list, Geom::Point const &p, bool take_insensitive)
SPItem *SPDocument::getItemFromListAtPointBottom(unsigned dkey, SPGroup *group, std::vector<SPItem*> const &list, Geom::Point const &p, bool take_insensitive, bool outline)
{
    if (!group) {
        return nullptr;
    }

    double const delta = Inkscape::Preferences::get()->getDouble("/options/cursortolerance/value", 1.0);
    std::optional<bool> outline;

    for (auto &c: group->children) {
        if (auto item = cast<SPItem>(&c)) {
            if (auto di = item->get_arenaitem(dkey)) {
                if (!outline) {
                    if (auto cid = di->drawing().getCanvasItemDrawing()) {
                        auto canvas = cid->get_canvas();
                        outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
                    }
                }
                if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline.value_or(false) * Inkscape::DrawingItem::PICK_OUTLINE) && (take_insensitive || item->isVisibleAndUnlocked(dkey))) {
                if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline * Inkscape::DrawingItem::PICK_OUTLINE) && (take_insensitive || item->isVisibleAndUnlocked(dkey))) {
                    if (std::find(list.begin(), list.end(), item) != list.end()) {
                        return item;
                    }
@@ -1863,10 +1856,9 @@ guaranteed to be lower than upto). Requires a list of nodes built by build_flat_
If items_count > 0, it'll return the topmost (in z-order) items_count items.
 */
static std::vector<SPItem*> find_items_at_point(std::deque<SPItem*> const &nodes, unsigned dkey,
                                                Geom::Point const &p, int items_count = 0, SPItem *upto = nullptr)
                                                Geom::Point const &p, int items_count = 0, SPItem *upto = nullptr, bool outline = false)
{
    double const delta = Inkscape::Preferences::get()->getDouble("/options/cursortolerance/value", 1.0);
    std::optional<bool> outline;

    std::vector<SPItem*> result;

@@ -1879,13 +1871,7 @@ static std::vector<SPItem*> find_items_at_point(std::deque<SPItem*> const &nodes
            continue;
        }
        if (auto di = node->get_arenaitem(dkey)) {
            if (!outline) {
                if (auto cid = di->drawing().getCanvasItemDrawing()) {
                    auto canvas = cid->get_canvas();
                    outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
                }
            }
            if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline.value_or(false) * Inkscape::DrawingItem::PICK_OUTLINE)) {
            if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline * Inkscape::DrawingItem::PICK_OUTLINE)) {
                result.emplace_back(node);
                if (--items_count == 0) {
                    break;
@@ -1897,9 +1883,9 @@ static std::vector<SPItem*> find_items_at_point(std::deque<SPItem*> const &nodes
    return result;
}

static SPItem *find_item_at_point(std::deque<SPItem*> const &nodes, unsigned dkey, Geom::Point const &p, SPItem *upto = nullptr)
static SPItem *find_item_at_point(std::deque<SPItem*> const &nodes, unsigned dkey, Geom::Point const &p, SPItem *upto = nullptr, bool outline = false)
{
    auto items = find_items_at_point(nodes, dkey, p, 1, upto);
    auto items = find_items_at_point(nodes, dkey, p, 1, upto, outline);
    if (items.empty()) {
        return nullptr;
    }
@@ -1910,25 +1896,18 @@ static SPItem *find_item_at_point(std::deque<SPItem*> const &nodes, unsigned dke
 * Returns the topmost non-layer group from the descendants of group which is at point p,
 * or null if none. Recurses into layers but not into groups.
 */
static SPItem *find_group_at_point(unsigned dkey, SPGroup *group, Geom::Point const &p)
static SPItem *find_group_at_point(unsigned dkey, SPGroup *group, Geom::Point const &p, bool outline)
{
    double const delta = Inkscape::Preferences::get()->getDouble("/options/cursortolerance/value", 1.0);
    std::optional<bool> outline;

    for (auto &c : group->children | std::views::reverse) {
        if (auto group = cast<SPGroup>(&c)) {
            if (group->effectiveLayerMode(dkey) == SPGroup::LAYER) {
                if (auto ret = find_group_at_point(dkey, group, p)) {
                if (auto ret = find_group_at_point(dkey, group, p, outline)) {
                    return ret;
                }
            } else if (auto di = group->get_arenaitem(dkey)) {
                if (!outline) {
                    if (auto cid = di->drawing().getCanvasItemDrawing()) {
                        auto canvas = cid->get_canvas();
                        outline = canvas->canvas_point_in_outline_zone(p - canvas->get_pos());
                    }
                }
                if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline.value_or(false) * Inkscape::DrawingItem::PICK_OUTLINE)) {
                if (di->pick(p, delta, Inkscape::DrawingItem::PICK_STICKY | outline * Inkscape::DrawingItem::PICK_OUTLINE)) {
                    return group;
                }
            }
@@ -1967,7 +1946,7 @@ std::vector<SPItem*> SPDocument::getItemsPartiallyInBox(unsigned int dkey, Geom:
    return find_items_in_area(x, this->root, dkey, box, overlaps, take_hidden, take_insensitive, take_groups, enter_groups, enter_layers);
}

std::vector<SPItem*> SPDocument::getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers, bool topmost_only, size_t limit, bool active_only) const
std::vector<SPItem*> SPDocument::getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers, bool topmost_only, size_t limit, bool active_only, bool outline) const
{
    std::vector<SPItem*> result;
    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -1987,7 +1966,7 @@ std::vector<SPItem*> SPDocument::getItemsAtPoints(unsigned const key, std::vecto
    }
    size_t item_counter = 0;
    for(auto point : points) {
        std::vector<SPItem*> items = find_items_at_point(node_cache, key, point, topmost_only);
        std::vector<SPItem*> items = find_items_at_point(node_cache, key, point, topmost_only, nullptr, outline);
        for (SPItem *item : items) {
            if (item && result.end()==find(result.begin(), result.end(), item))
                if(all_layers || (desktop && desktop->layerManager().layerForObject(item) == current_layer)){
@@ -2009,14 +1988,14 @@ std::vector<SPItem*> SPDocument::getItemsAtPoints(unsigned const key, std::vecto
}

SPItem *SPDocument::getItemAtPoint( unsigned const key, Geom::Point const &p,
                                    bool const into_groups, SPItem *upto) const
                                    bool const into_groups, SPItem *upto, bool outline) const
{
    return find_item_at_point(get_flat_item_list(key, into_groups, true), key, p, upto);
    return find_item_at_point(get_flat_item_list(key, into_groups, true), key, p, upto, outline);
}

SPItem *SPDocument::getGroupAtPoint(unsigned int key, Geom::Point const &p) const
SPItem *SPDocument::getGroupAtPoint(unsigned int key, Geom::Point const &p, bool outline) const
{
    return find_group_at_point(key, this->root, p);
    return find_group_at_point(key, this->root, p, outline);
}

// Resource management
Original line number Diff line number Diff line
@@ -344,16 +344,23 @@ public:

    std::vector<SPItem*> getItemsInBox         (unsigned int dkey, Geom::Rect const &box, bool take_hidden = false, bool take_insensitive = false, bool take_groups = true, bool enter_groups = false, bool enter_layers = true) const;
    std::vector<SPItem*> getItemsPartiallyInBox(unsigned int dkey, Geom::Rect const &box, bool take_hidden = false, bool take_insensitive = false, bool take_groups = true, bool enter_groups = false, bool enter_layers = true) const;
    SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = nullptr) const;
    std::vector<SPItem*> getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers = true, bool topmost_only = true, size_t limit = 0, bool active_only = true) const;
    SPItem *getGroupAtPoint(unsigned int key,  Geom::Point const &p) const;

protected:
    // These functions should be moved to desktop, or canvas. They do not belong in a document API
    friend class SPDesktop;

    SPItem *getItemAtPoint(unsigned int key, Geom::Point const &p, bool into_groups, SPItem *upto = nullptr, bool outline = false) const;

    std::vector<SPItem*> getItemsAtPoints(unsigned const key, std::vector<Geom::Point> points, bool all_layers = true, bool topmost_only = true, size_t limit = 0, bool active_only = true, bool outline = false) const;

    SPItem *getGroupAtPoint(unsigned int key,  Geom::Point const &p, bool outline = false) const;

    /**
     * Returns the bottommost item from the list which is at the point, or NULL if none.
     */
    static SPItem *getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, const std::vector<SPItem*> &list, Geom::Point const &p, bool take_insensitive = false);

    static SPItem *getItemFromListAtPointBottom(unsigned int dkey, SPGroup *group, const std::vector<SPItem*> &list, Geom::Point const &p, bool take_insensitive = false, bool outline = false);

public:
    // Box tool -------------------------------
    void setCurrentPersp3D(Persp3D * const persp);
    /*
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ std::vector<EraseTarget> EraserTool::_findItemsToErase()
        // * result     should contain touched items;
        // * _survivors should contain selected but untouched items.
        auto *r = Rubberband::get(_desktop);
        std::vector<SPItem *> touched = document->getItemsAtPoints(_desktop->dkey, r->getPoints());
        std::vector<SPItem *> touched = _desktop->getItemsAtPoints(r->getPoints());
        if (selection->isEmpty()) {
            for (auto *item : touched) {
                result.emplace_back(item, false);
Original line number Diff line number Diff line
@@ -694,7 +694,7 @@ bool SelectTool::root_handler(CanvasEvent const &event)
                            items = _desktop->getDocument()->getItemsPartiallyInBox(_desktop->dkey, (*b) * _desktop->dt2doc());
                        } else if (r->getMode() == Rubberband::Mode::TOUCHPATH) {
                            bool topmost_items_only = prefs->getBool("/options/selection/touchsel_topmost_only");
                            items = _desktop->getDocument()->getItemsAtPoints(_desktop->dkey, r->getPoints(), true, topmost_items_only);
                            items = _desktop->getItemsAtPoints(r->getPoints(), true, topmost_items_only);
                        }

                        _seltrans->resetState();