From f9133733511c6b37748e0714aaa6c4ec71ea13c7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 26 Apr 2022 22:02:22 -0600 Subject: [PATCH] canvas: change Item::bb_clean() to better named Item::set_bbox_clean() --- libs/canvas/arc.cc | 2 +- libs/canvas/arrow.cc | 2 +- libs/canvas/box.cc | 4 ++-- libs/canvas/canvas/item.h | 2 +- libs/canvas/container.cc | 2 +- libs/canvas/grid.cc | 4 ++-- libs/canvas/image.cc | 2 +- libs/canvas/item.cc | 2 +- libs/canvas/line.cc | 2 +- libs/canvas/line_set.cc | 2 +- libs/canvas/meter.cc | 4 ++-- libs/canvas/pixbuf.cc | 2 +- libs/canvas/poly_item.cc | 2 +- libs/canvas/rectangle.cc | 2 +- libs/canvas/step_button.cc | 2 +- libs/canvas/table.cc | 4 ++-- libs/canvas/text.cc | 4 ++-- libs/canvas/widget.cc | 2 +- libs/canvas/xfade_curve.cc | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libs/canvas/arc.cc b/libs/canvas/arc.cc index 9f45f5b39a..e08ea04c03 100644 --- a/libs/canvas/arc.cc +++ b/libs/canvas/arc.cc @@ -64,7 +64,7 @@ Arc::compute_bounding_box () const bbox = bbox.expand (0.5 + (_outline_width / 2)); _bounding_box = bbox; - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/arrow.cc b/libs/canvas/arrow.cc index 7a4678e60b..7a72eb7168 100644 --- a/libs/canvas/arrow.cc +++ b/libs/canvas/arrow.cc @@ -79,7 +79,7 @@ Arrow::compute_bounding_box () const _line->x1() + (head_width / 2.0) + outline_pad, _line->y1()); - bb_clean (); + set_bbox_clean (); } /** Set whether to show an arrow head at one end or other diff --git a/libs/canvas/box.cc b/libs/canvas/box.cc index 418c30daff..43571a4773 100644 --- a/libs/canvas/box.cc +++ b/libs/canvas/box.cc @@ -78,7 +78,7 @@ Box::compute_bounding_box () const _bounding_box = Rect(); if (_items.empty()) { - bb_clean (); + set_bbox_clean (); return; } @@ -93,7 +93,7 @@ Box::compute_bounding_box () const left_padding + outline_width() + left_margin); } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h index a65eae7b4e..d63f41ed87 100644 --- a/libs/canvas/canvas/item.h +++ b/libs/canvas/canvas/item.h @@ -335,7 +335,7 @@ public: mutable Rect _bounding_box; PackOptions _pack_options; - void bb_clean () const; + void set_bbox_clean () const; void set_bbox_dirty () const; bool bbox_dirty() const { return _bounding_box_dirty; } diff --git a/libs/canvas/container.cc b/libs/canvas/container.cc index 52c1ddedc3..95efc97f8a 100644 --- a/libs/canvas/container.cc +++ b/libs/canvas/container.cc @@ -54,5 +54,5 @@ Container::compute_bounding_box () const { _bounding_box = Rect (); /* nothing to do here; Item::bounding_box() will add all children for us */ - bb_clean (); + set_bbox_clean (); } diff --git a/libs/canvas/grid.cc b/libs/canvas/grid.cc index 100a666ee9..682e8bfea0 100644 --- a/libs/canvas/grid.cc +++ b/libs/canvas/grid.cc @@ -88,7 +88,7 @@ Grid::compute_bounding_box () const _bounding_box = Rect(); if (_items.empty()) { - bb_clean (); + set_bbox_clean (); return; } @@ -103,7 +103,7 @@ Grid::compute_bounding_box () const outline_width() + left_margin + left_padding); } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/image.cc b/libs/canvas/image.cc index fd55c14ba3..0c56e2369a 100644 --- a/libs/canvas/image.cc +++ b/libs/canvas/image.cc @@ -69,7 +69,7 @@ void Image::compute_bounding_box () const { _bounding_box = Rect (0, 0, _width, _height); - bb_clean (); + set_bbox_clean (); } boost::shared_ptr diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc index cc9a9b38ec..91a987bedb 100644 --- a/libs/canvas/item.cc +++ b/libs/canvas/item.cc @@ -1334,7 +1334,7 @@ Item::set_layout_sensitive (bool yn) } void -Item::bb_clean () const +Item::set_bbox_clean () const { _bounding_box_dirty = false; } diff --git a/libs/canvas/line.cc b/libs/canvas/line.cc index 86b4d5af86..39bb614937 100644 --- a/libs/canvas/line.cc +++ b/libs/canvas/line.cc @@ -52,7 +52,7 @@ Line::compute_bounding_box () const bbox = bbox.expand (0.5 + (_outline_width / 2)); _bounding_box = bbox; - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/line_set.cc b/libs/canvas/line_set.cc index bebf1f0100..bf2b130a6b 100644 --- a/libs/canvas/line_set.cc +++ b/libs/canvas/line_set.cc @@ -71,7 +71,7 @@ LineSet::compute_bounding_box () const } } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/meter.cc b/libs/canvas/meter.cc index c6e1fe33f1..f9384c5441 100644 --- a/libs/canvas/meter.cc +++ b/libs/canvas/meter.cc @@ -170,13 +170,13 @@ Meter::compute_bounding_box () const { if (!_canvas) { _bounding_box = Rect (); - bb_clean (); + set_bbox_clean (); return; } Rect r (0, 0, pixwidth + 2, pixheight + 2); _bounding_box = r; - bb_clean (); + set_bbox_clean (); } diff --git a/libs/canvas/pixbuf.cc b/libs/canvas/pixbuf.cc index 48b6f05154..1f96946466 100644 --- a/libs/canvas/pixbuf.cc +++ b/libs/canvas/pixbuf.cc @@ -52,7 +52,7 @@ Pixbuf::compute_bounding_box () const _bounding_box = Rect (); } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/poly_item.cc b/libs/canvas/poly_item.cc index dcffa153f0..fa94672fdb 100644 --- a/libs/canvas/poly_item.cc +++ b/libs/canvas/poly_item.cc @@ -63,7 +63,7 @@ PolyItem::compute_bounding_box () const _bounding_box = Rect (); } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc index b03a310a53..20ea629519 100644 --- a/libs/canvas/rectangle.cc +++ b/libs/canvas/rectangle.cc @@ -175,7 +175,7 @@ Rectangle::compute_bounding_box () const _bounding_box = _rect.fix().expand (_outline_width * 0.5); } - bb_clean (); + set_bbox_clean (); } void diff --git a/libs/canvas/step_button.cc b/libs/canvas/step_button.cc index 12b237c2d4..79f6b76e87 100644 --- a/libs/canvas/step_button.cc +++ b/libs/canvas/step_button.cc @@ -69,7 +69,7 @@ StepButton::compute_bounding_box () const /* Item::bounding_box() will add children */ - bb_clean (); + set_bbox_clean (); } #define CORNER_RADIUS 5 diff --git a/libs/canvas/table.cc b/libs/canvas/table.cc index 4aeac549e9..717f3924d6 100644 --- a/libs/canvas/table.cc +++ b/libs/canvas/table.cc @@ -110,7 +110,7 @@ Table::compute_bounding_box() const { if (cells.empty()) { _bounding_box = Rect(); - bb_clean (); + set_bbox_clean (); return; } @@ -125,7 +125,7 @@ Table::compute_bounding_box() const DEBUG_TRACE (DEBUG::CanvasTable, string_compose ("bounding box computed as %1\n", _bounding_box)); - bb_clean (); + set_bbox_clean (); } diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index 3d44f36968..355c3f116c 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -254,7 +254,7 @@ Text::compute_bounding_box () const { if (!_canvas || _text.empty()) { _bounding_box = Rect (); - bb_clean (); + set_bbox_clean (); return; } @@ -268,7 +268,7 @@ Text::compute_bounding_box () const _redraw (); } _bounding_box = Rect (0, 0, min (_clamped_width, (double) _image->get_width() * retina_factor), _image->get_height() * retina_factor); - bb_clean (); + set_bbox_clean (); } } diff --git a/libs/canvas/widget.cc b/libs/canvas/widget.cc index 30040e4783..4284baca32 100644 --- a/libs/canvas/widget.cc +++ b/libs/canvas/widget.cc @@ -131,5 +131,5 @@ Widget::compute_bounding_box () const _bounding_box = Rect (0., 0., req.width, req.height); } - bb_clean (); + set_bbox_clean (); } diff --git a/libs/canvas/xfade_curve.cc b/libs/canvas/xfade_curve.cc index d770cf3e67..da98579fb1 100644 --- a/libs/canvas/xfade_curve.cc +++ b/libs/canvas/xfade_curve.cc @@ -115,7 +115,7 @@ XFadeCurve::compute_bounding_box () const _bounding_box = Rect (); } - bb_clean (); + set_bbox_clean (); } void