summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/sodipodi-ctrlrect.cpp181
-rw-r--r--src/display/sodipodi-ctrlrect.h5
2 files changed, 97 insertions, 89 deletions
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index 2379fcefd..b4539841b 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -15,8 +15,8 @@
*
*/
-#include "sp-canvas-util.h"
#include "sodipodi-ctrlrect.h"
+#include "sp-canvas-util.h"
#include "display/cairo-utils.h"
/*
@@ -104,8 +104,7 @@ void CtrlRect::init()
_dashed = false;
_shadow = 0;
- _area.x0 = _area.y0 = 0;
- _area.x1 = _area.y1 = 0;
+ _area = Geom::OptIntRect();
_rect = Geom::Rect(Geom::Point(0,0),Geom::Point(0,0));
@@ -119,20 +118,25 @@ void CtrlRect::init()
void CtrlRect::render(SPCanvasBuf *buf)
{
+ using Geom::X;
+ using Geom::Y;
+
static double const dashes[2] = {4.0, 4.0};
- if ((_area.x0 != 0 || _area.x1 != 0 || _area.y0 != 0 || _area.y1 != 0) &&
- (_area.x0 < buf->rect.x1) &&
- (_area.y0 < buf->rect.y1) &&
- ((_area.x1 + _shadow_size) >= buf->rect.x0) &&
- ((_area.y1 + _shadow_size) >= buf->rect.y0))
+ if (!_area) {
+ return;
+ }
+ Geom::IntRect area = *_area;
+ Geom::IntRect area_w_shadow (area[X].min(), area[Y].min(),
+ area[X].max() + _shadow_size, area[Y].max() + _shadow_size);
+ if ( area_w_shadow.intersects(buf->rect) )
{
cairo_save(buf->ct);
cairo_translate(buf->ct, -buf->rect.x0, -buf->rect.y0);
cairo_set_line_width(buf->ct, 1);
if (_dashed) cairo_set_dash(buf->ct, dashes, 2, 0);
- cairo_rectangle(buf->ct, 0.5 + _area.x0, 0.5 + _area.y0,
- _area.x1 - _area.x0, _area.y1 - _area.y0);
+ cairo_rectangle(buf->ct, 0.5 + area[X].min(), 0.5 + area[Y].min(),
+ area[X].max() - area[X].min(), area[Y].max() - area[Y].min());
if (_has_fill) {
ink_cairo_set_source_rgba32(buf->ct, _fill_color);
@@ -143,10 +147,10 @@ void CtrlRect::render(SPCanvasBuf *buf)
if (_shadow_size > 0) {
ink_cairo_set_source_rgba32(buf->ct, _shadow_color);
- cairo_rectangle(buf->ct, 1 + _area.x1, _area.y0 + _shadow_size,
- _shadow_size, _area.y1 - _area.y0 + 1); // right shadow
- cairo_rectangle(buf->ct, _area.x0 + _shadow_size, 1 + _area.y1,
- _area.x1 - _area.x0 - _shadow_size + 1, _shadow_size);
+ cairo_rectangle(buf->ct, 1 + area[X].max(), area[Y].min() + _shadow_size,
+ _shadow_size, area[Y].max() - area[Y].min() + 1); // right shadow
+ cairo_rectangle(buf->ct, area[X].min() + _shadow_size, 1 + area[Y].max(),
+ area[X].max() - area[X].min() - _shadow_size + 1, _shadow_size);
cairo_fill(buf->ct);
}
cairo_restore(buf->ct);
@@ -156,145 +160,148 @@ void CtrlRect::render(SPCanvasBuf *buf)
void CtrlRect::update(Geom::Affine const &affine, unsigned int flags)
{
+ using Geom::X;
+ using Geom::Y;
+
if (((SPCanvasItemClass *) parent_class)->update) {
((SPCanvasItemClass *) parent_class)->update(this, affine, flags);
}
sp_canvas_item_reset_bounds(this);
- NRRectL _area_old;
- _area_old.x0 = _area.x0;
- _area_old.x1 = _area.x1;
- _area_old.y0 = _area.y0;
- _area_old.y1 = _area.y1;
-
Geom::Rect bbox(_rect.min() * affine, _rect.max() * affine);
- _area.x0 = (int) floor(bbox.min()[Geom::X] + 0.5);
- _area.y0 = (int) floor(bbox.min()[Geom::Y] + 0.5);
- _area.x1 = (int) floor(bbox.max()[Geom::X] + 0.5);
- _area.y1 = (int) floor(bbox.max()[Geom::Y] + 0.5);
+ Geom::OptIntRect _area_old = _area;
+ Geom::IntRect area ( (int) floor(bbox.min()[Geom::X] + 0.5),
+ (int) floor(bbox.min()[Geom::Y] + 0.5),
+ (int) floor(bbox.max()[Geom::X] + 0.5),
+ (int) floor(bbox.max()[Geom::Y] + 0.5) );
+ _area = area;
+ Geom::IntRect area_old(0,0,0,0);
+ if (_area_old) { // this weird construction is because the code below assumes _area_old to be 'valid'
+ area_old = *_area_old;
+ }
gint _shadow_size_old = _shadow_size;
_shadow_size = _shadow;
// FIXME: we don't process a possible change in _has_fill
if (_has_fill) {
- if (_area_old.x0 != 0 || _area_old.x1 != 0 || _area_old.y0 != 0 || _area_old.y1 != 0) {
+ if (_area_old) {
sp_canvas_request_redraw(canvas,
- _area_old.x0 - 1, _area_old.y0 - 1,
- _area_old.x1 + _shadow_size + 1, _area_old.y1 + _shadow_size + 1);
+ area_old[X].min() - 1, area_old[Y].min() - 1,
+ area_old[X].max() + _shadow_size + 1, area_old[Y].max() + _shadow_size + 1);
}
- if (_area.x0 != 0 || _area.x1 != 0 || _area.y0 != 0 || _area.y1 != 0) {
+ if (_area) {
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, _area.y0 - 1,
- _area.x1 + _shadow_size + 1, _area.y1 + _shadow_size + 1);
+ area[X].min() - 1, area[Y].min() - 1,
+ area[X].max() + _shadow_size + 1, area[Y].max() + _shadow_size + 1);
}
} else { // clear box, be smart about what part of the frame to redraw
/* Top */
- if (_area.y0 != _area_old.y0) { // different level, redraw fully old and new
- if (_area_old.x0 != _area_old.x1)
+ if (area[Y].min() != area_old[Y].min()) { // different level, redraw fully old and new
+ if (area_old[X].min() != area_old[X].max())
sp_canvas_request_redraw(canvas,
- _area_old.x0 - 1, _area_old.y0 - 1,
- _area_old.x1 + 1, _area_old.y0 + 1);
+ area_old[X].min() - 1, area_old[Y].min() - 1,
+ area_old[X].max() + 1, area_old[Y].min() + 1);
- if (_area.x0 != _area.x1)
+ if (area[X].min() != area[X].max())
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, _area.y0 - 1,
- _area.x1 + 1, _area.y0 + 1);
+ area[X].min() - 1, area[Y].min() - 1,
+ area[X].max() + 1, area[Y].min() + 1);
} else { // same level, redraw only the ends
- if (_area.x0 != _area_old.x0) {
+ if (area[X].min() != area_old[X].min()) {
sp_canvas_request_redraw(canvas,
- MIN(_area_old.x0,_area.x0) - 1, _area.y0 - 1,
- MAX(_area_old.x0,_area.x0) + 1, _area.y0 + 1);
+ MIN(area_old[X].min(),area[X].min()) - 1, area[Y].min() - 1,
+ MAX(area_old[X].min(),area[X].min()) + 1, area[Y].min() + 1);
}
- if (_area.x1 != _area_old.x1) {
+ if (area[X].max() != area_old[X].max()) {
sp_canvas_request_redraw(canvas,
- MIN(_area_old.x1,_area.x1) - 1, _area.y0 - 1,
- MAX(_area_old.x1,_area.x1) + 1, _area.y0 + 1);
+ MIN(area_old[X].max(),area[X].max()) - 1, area[Y].min() - 1,
+ MAX(area_old[X].max(),area[X].max()) + 1, area[Y].min() + 1);
}
}
/* Left */
- if (_area.x0 != _area_old.x0) { // different level, redraw fully old and new
- if (_area_old.y0 != _area_old.y1)
+ if (area[X].min() != area_old[X].min()) { // different level, redraw fully old and new
+ if (area_old[Y].min() != area_old[Y].max())
sp_canvas_request_redraw(canvas,
- _area_old.x0 - 1, _area_old.y0 - 1,
- _area_old.x0 + 1, _area_old.y1 + 1);
+ area_old[X].min() - 1, area_old[Y].min() - 1,
+ area_old[X].min() + 1, area_old[Y].max() + 1);
- if (_area.y0 != _area.y1)
+ if (area[Y].min() != area[Y].max())
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, _area.y0 - 1,
- _area.x0 + 1, _area.y1 + 1);
+ area[X].min() - 1, area[Y].min() - 1,
+ area[X].min() + 1, area[Y].max() + 1);
} else { // same level, redraw only the ends
- if (_area.y0 != _area_old.y0) {
+ if (area[Y].min() != area_old[Y].min()) {
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, MIN(_area_old.y0,_area.y0) - 1,
- _area.x0 + 1, MAX(_area_old.y0,_area.y0) + 1);
+ area[X].min() - 1, MIN(area_old[Y].min(),area[Y].min()) - 1,
+ area[X].min() + 1, MAX(area_old[Y].min(),area[Y].min()) + 1);
}
- if (_area.y1 != _area_old.y1) {
+ if (area[Y].max() != area_old[Y].max()) {
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, MIN(_area_old.y1,_area.y1) - 1,
- _area.x0 + 1, MAX(_area_old.y1,_area.y1) + 1);
+ area[X].min() - 1, MIN(area_old[Y].max(),area[Y].max()) - 1,
+ area[X].min() + 1, MAX(area_old[Y].max(),area[Y].max()) + 1);
}
}
/* Right */
- if (_area.x1 != _area_old.x1 || _shadow_size_old != _shadow_size) {
- if (_area_old.y0 != _area_old.y1)
+ if (area[X].max() != area_old[X].max() || _shadow_size_old != _shadow_size) {
+ if (area_old[Y].min() != area_old[Y].max())
sp_canvas_request_redraw(canvas,
- _area_old.x1 - 1, _area_old.y0 - 1,
- _area_old.x1 + _shadow_size + 1, _area_old.y1 + _shadow_size + 1);
+ area_old[X].max() - 1, area_old[Y].min() - 1,
+ area_old[X].max() + _shadow_size + 1, area_old[Y].max() + _shadow_size + 1);
- if (_area.y0 != _area.y1)
+ if (area[Y].min() != area[Y].max())
sp_canvas_request_redraw(canvas,
- _area.x1 - 1, _area.y0 - 1,
- _area.x1 + _shadow_size + 1, _area.y1 + _shadow_size + 1);
+ area[X].max() - 1, area[Y].min() - 1,
+ area[X].max() + _shadow_size + 1, area[Y].max() + _shadow_size + 1);
} else { // same level, redraw only the ends
- if (_area.y0 != _area_old.y0) {
+ if (area[Y].min() != area_old[Y].min()) {
sp_canvas_request_redraw(canvas,
- _area.x1 - 1, MIN(_area_old.y0,_area.y0) - 1,
- _area.x1 + _shadow_size + 1, MAX(_area_old.y0,_area.y0) + _shadow_size + 1);
+ area[X].max() - 1, MIN(area_old[Y].min(),area[Y].min()) - 1,
+ area[X].max() + _shadow_size + 1, MAX(area_old[Y].min(),area[Y].min()) + _shadow_size + 1);
}
- if (_area.y1 != _area_old.y1) {
+ if (area[Y].max() != area_old[Y].max()) {
sp_canvas_request_redraw(canvas,
- _area.x1 - 1, MIN(_area_old.y1,_area.y1) - 1,
- _area.x1 + _shadow_size + 1, MAX(_area_old.y1,_area.y1) + _shadow_size + 1);
+ area[X].max() - 1, MIN(area_old[Y].max(),area[Y].max()) - 1,
+ area[X].max() + _shadow_size + 1, MAX(area_old[Y].max(),area[Y].max()) + _shadow_size + 1);
}
}
/* Bottom */
- if (_area.y1 != _area_old.y1 || _shadow_size_old != _shadow_size) {
- if (_area_old.x0 != _area_old.x1)
+ if (area[Y].max() != area_old[Y].max() || _shadow_size_old != _shadow_size) {
+ if (area_old[X].min() != area_old[X].max())
sp_canvas_request_redraw(canvas,
- _area_old.x0 - 1, _area_old.y1 - 1,
- _area_old.x1 + _shadow_size + 1, _area_old.y1 + _shadow_size + 1);
+ area_old[X].min() - 1, area_old[Y].max() - 1,
+ area_old[X].max() + _shadow_size + 1, area_old[Y].max() + _shadow_size + 1);
- if (_area.x0 != _area.x1)
+ if (area[X].min() != area[X].max())
sp_canvas_request_redraw(canvas,
- _area.x0 - 1, _area.y1 - 1,
- _area.x1 + _shadow_size + 1, _area.y1 + _shadow_size + 1);
+ area[X].min() - 1, area[Y].max() - 1,
+ area[X].max() + _shadow_size + 1, area[Y].max() + _shadow_size + 1);
} else { // same level, redraw only the ends
- if (_area.x0 != _area_old.x0) {
+ if (area[X].min() != area_old[X].min()) {
sp_canvas_request_redraw(canvas,
- MIN(_area_old.x0,_area.x0) - 1, _area.y1 - 1,
- MAX(_area_old.x0,_area.x0) + _shadow_size + 1, _area.y1 + _shadow_size + 1);
+ MIN(area_old[X].min(),area[X].min()) - 1, area[Y].max() - 1,
+ MAX(area_old[X].min(),area[X].min()) + _shadow_size + 1, area[Y].max() + _shadow_size + 1);
}
- if (_area.x1 != _area_old.x1) {
+ if (area[X].max() != area_old[X].max()) {
sp_canvas_request_redraw(canvas,
- MIN(_area_old.x1,_area.x1) - 1, _area.y1 - 1,
- MAX(_area_old.x1,_area.x1) + _shadow_size + 1, _area.y1 + _shadow_size + 1);
+ MIN(area_old[X].max(),area[X].max()) - 1, area[Y].max() - 1,
+ MAX(area_old[X].max(),area[X].max()) + _shadow_size + 1, area[Y].max() + _shadow_size + 1);
}
}
}
// update SPCanvasItem box
- if (_area.x0 != 0 || _area.x1 != 0 || _area.y0 != 0 || _area.y1 != 0) {
- x1 = _area.x0 - 1;
- y1 = _area.y0 - 1;
- x2 = _area.x1 + _shadow_size + 1;
- y2 = _area.y1 + _shadow_size + 1;
+ if (_area) {
+ x1 = area[X].min() - 1;
+ y1 = area[Y].min() - 1;
+ x2 = area[X].max() + _shadow_size + 1;
+ y2 = area[Y].max() + _shadow_size + 1;
}
}
diff --git a/src/display/sodipodi-ctrlrect.h b/src/display/sodipodi-ctrlrect.h
index e69b6ba68..45f8523ed 100644
--- a/src/display/sodipodi-ctrlrect.h
+++ b/src/display/sodipodi-ctrlrect.h
@@ -18,7 +18,8 @@
#include <glib/gtypes.h>
#include "sp-canvas-item.h"
-#include "libnr/nr-rect-l.h"
+#include <2geom/rect.h>
+#include <2geom/int-rect.h>
struct SPCanvasBuf;
@@ -47,7 +48,7 @@ private:
Geom::Rect _rect;
bool _has_fill;
bool _dashed;
- NRRectL _area;
+ Geom::OptIntRect _area;
gint _shadow_size;
guint32 _border_color;
guint32 _fill_color;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 14:27:25 +0000