index 367a744c7d64680a14891c2c2f35ad757b31d976..3203816d36f96850cdd956bade4456b46d03c163 100644 (file)
selected.erase(master);
/*}*/
//Compute the anchor point
- boost::optional<Geom::Rect> b = sp_item_bbox_desktop (thing);
+ Geom::OptRect b = sp_item_bbox_desktop (thing);
if (b) {
mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X],
a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]);
case AlignAndDistribute::DRAWING:
{
- boost::optional<Geom::Rect> b = sp_item_bbox_desktop
+ Geom::OptRect b = sp_item_bbox_desktop
( (SPItem *) sp_document_root (sp_desktop_document (desktop)) );
if (b) {
mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X],
case AlignAndDistribute::SELECTION:
{
- boost::optional<Geom::Rect> b = selection->bounds();
+ Geom::OptRect b = selection->bounds();
if (b) {
mp = Geom::Point(a.mx0 * b->min()[Geom::X] + a.mx1 * b->max()[Geom::X],
a.my0 * b->min()[Geom::Y] + a.my1 * b->max()[Geom::Y]);
prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
bool changed = false;
- boost::optional<Geom::Rect> b;
+ Geom::OptRect b;
if (sel_as_group)
b = selection->bounds();
it != selected.end();
++it)
{
- boost::optional<Geom::Rect> bbox = sp_item_bbox_desktop(*it);
+ Geom::OptRect bbox = sp_item_bbox_desktop(*it);
if (bbox) {
sorted.push_back(BBoxSort(*it, *bbox, _orientation, _kBegin, _kEnd));
}
if (!SP_IS_NODE_CONTEXT (event_context)) return ;
if (_distribute)
- SP_NODE_CONTEXT (event_context)->shape_editor->distribute((Geom::Dim2)_orientation);
+ event_context->shape_editor->distribute((Geom::Dim2)_orientation);
else
- SP_NODE_CONTEXT (event_context)->shape_editor->align((Geom::Dim2)_orientation);
+ event_context->shape_editor->align((Geom::Dim2)_orientation);
}
};
//Check 2 or more selected objects
if (selected.size() < 2) return;
- boost::optional<Geom::Rect> sel_bbox = selection->bounds();
+ Geom::OptRect sel_bbox = selection->bounds();
if (!sel_bbox) {
return;
}
++it)
{
sp_document_ensure_up_to_date(sp_desktop_document (desktop));
- boost::optional<Geom::Rect> item_box = sp_item_bbox_desktop (*it);
+ Geom::OptRect item_box = sp_item_bbox_desktop (*it);
if (item_box) {
// find new center, staying within bbox
double x = _dialog.randomize_bbox->min()[Geom::X] + (*item_box)[Geom::X].extent() /2 +
@@ -780,7 +780,7 @@ void on_tool_changed(Inkscape::Application */*inkscape*/, SPEventContext */*cont
void on_selection_changed(Inkscape::Application */*inkscape*/, Inkscape::Selection */*selection*/, AlignAndDistribute *daad)
{
- daad->randomize_bbox = boost::optional<Geom::Rect>();
+ daad->randomize_bbox = Geom::OptRect();
}
/////////////////////////////////////////////////////////
// Connect to the global selection change, to invalidate cached randomize_bbox
g_signal_connect (G_OBJECT (INKSCAPE), "change_selection", G_CALLBACK (on_selection_changed), this);
- randomize_bbox = boost::optional<Geom::Rect>();
+ randomize_bbox = Geom::OptRect();
show_all_children();
@@ -1106,7 +1106,7 @@ std::list<SPItem *>::iterator AlignAndDistribute::find_master( std::list<SPItem
{
gdouble max = -1e18;
for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); it++) {
- boost::optional<Geom::Rect> b = sp_item_bbox_desktop (*it);
+ Geom::OptRect b = sp_item_bbox_desktop (*it);
if (b) {
gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent();
if (dim > max) {
@@ -1123,7 +1123,7 @@ std::list<SPItem *>::iterator AlignAndDistribute::find_master( std::list<SPItem
{
gdouble max = 1e18;
for (std::list<SPItem *>::iterator it = list.begin(); it != list.end(); it++) {
- boost::optional<Geom::Rect> b = sp_item_bbox_desktop (*it);
+ Geom::OptRect b = sp_item_bbox_desktop (*it);
if (b) {
gdouble dim = (*b)[horizontal ? Geom::X : Geom::Y].extent();
if (dim < max) {