From fc2426d373999bea98adb524a5cf5162ead74e84 Mon Sep 17 00:00:00 2001 From: ExMix Date: Mon, 23 Sep 2013 19:19:24 +0300 Subject: [PATCH] use only symbol bound rects for overlay merging. Circles can overlap --- graphics/circled_symbol.cpp | 12 ------------ graphics/circled_symbol.hpp | 1 - 2 files changed, 13 deletions(-) diff --git a/graphics/circled_symbol.cpp b/graphics/circled_symbol.cpp index 1a6ad1c6f2..108ecc5c14 100644 --- a/graphics/circled_symbol.cpp +++ b/graphics/circled_symbol.cpp @@ -7,18 +7,6 @@ namespace graphics : SymbolElement(symbolElement) , m_circle(circleElement) {} - vector const & CircledSymbol::boundRects() const - { - if (isDirtyRect()) - { - SymbolElement::boundRects(); - vector circleBounds = m_circle.boundRects(); - m_boundRects.insert(m_boundRects.end(), circleBounds.begin(), circleBounds.end()); - } - - return SymbolElement::boundRects(); - } - void CircledSymbol::draw(OverlayRenderer * s, math::Matrix const & m) const { m_circle.draw(s, m); diff --git a/graphics/circled_symbol.hpp b/graphics/circled_symbol.hpp index a4384abc09..cd573fdf54 100644 --- a/graphics/circled_symbol.hpp +++ b/graphics/circled_symbol.hpp @@ -11,7 +11,6 @@ namespace graphics CircledSymbol(SymbolElement::Params const & symbolElement, CircleElement::Params const & circleElement); - vector const & boundRects() const; void draw(OverlayRenderer * s, math::Matrix const & m) const; void setTransformation(const math::Matrix & m);