Update to experimental r13565

(bzr r13341.5.16)

1 files changed, 55 insertions, 7 deletions

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index ecaea1586..4785dc588 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -99,6 +99,8 @@ SPItem::SPItem() : SPObject() {
     sensitive = TRUE;
     bbox_valid = FALSE;
 
+    _highlightColor = NULL;
+
     transform_center_x = 0;
     transform_center_y = 0;
 
@@ -179,6 +181,26 @@ bool SPItem::isHidden(unsigned display_key) const {
     return true;
 }
 
+bool SPItem::isHighlightSet() const {
+    return _highlightColor != NULL;
+}
+
+guint32 SPItem::highlight_color() const {
+    if (_highlightColor)
+    {
+        return atoi(_highlightColor) | 0x00000000;
+    }
+    else if (parent && parent != this && SP_IS_ITEM(parent))
+    {
+        return SP_ITEM(parent)->highlight_color();
+    }
+    else
+    {
+        static Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        return prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) | 0x00000000;
+    }
+}
+
 void SPItem::setEvaluated(bool evaluated) {
     _is_evaluated = evaluated;
     _evaluated_status = StatusSet;
@@ -234,9 +256,13 @@ void SPItem::setCenter(Geom::Point const &object_centre) {
     document->ensureUpToDate();
 
     // Copied from DocumentProperties::onDocUnitChange()
-    gdouble viewscale_w = this->document->getWidth().value("px") / this->document->getRoot()->viewBox.width();
-    gdouble viewscale_h = this->document->getHeight().value("px")/ this->document->getRoot()->viewBox.height();
-    gdouble viewscale = std::min(viewscale_h, viewscale_w);
+    gdouble viewscale = 1.0;
+    Geom::Rect vb = this->document->getRoot()->viewBox;
+    if ( !vb.hasZeroArea() ) {
+        gdouble viewscale_w = this->document->getWidth().value("px") / vb.width();
+        gdouble viewscale_h = this->document->getHeight().value("px")/ vb.height();
+        viewscale = std::min(viewscale_h, viewscale_w);
+    }
 
     // FIXME this is seriously wrong
     Geom::OptRect bbox = desktopGeometricBounds();
@@ -267,9 +293,13 @@ Geom::Point SPItem::getCenter() const {
     document->ensureUpToDate();
 
     // Copied from DocumentProperties::onDocUnitChange()
-    gdouble viewscale_w = this->document->getWidth().value("px") / this->document->getRoot()->viewBox.width();
-    gdouble viewscale_h = this->document->getHeight().value("px")/ this->document->getRoot()->viewBox.height();
-    gdouble viewscale = std::min(viewscale_h, viewscale_w);
+    gdouble viewscale = 1.0;
+    Geom::Rect vb = this->document->getRoot()->viewBox;
+    if ( !vb.hasZeroArea() ) {
+        gdouble viewscale_w = this->document->getWidth().value("px") / vb.width();
+        gdouble viewscale_h = this->document->getHeight().value("px")/ vb.height();
+        viewscale = std::min(viewscale_h, viewscale_w);
+    }
 
     // FIXME this is seriously wrong
     Geom::OptRect bbox = desktopGeometricBounds();
@@ -360,7 +390,7 @@ void SPItem::lowerToBottom() {
  * \param  target - the SPItem to move into or after
  * \param  intoafter - move to after the target (false), move inside (sublayer) of the target (true)
  */
-void SPItem::moveTo(SPItem *target, gboolean intoafter) {
+void SPItem::moveTo(SPItem *target, bool intoafter) {
 
     Inkscape::XML::Node *target_ref = ( target ? target->getRepr() : NULL );
     Inkscape::XML::Node *our_ref = getRepr();
@@ -413,6 +443,7 @@ void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
     object->readAttr( "inkscape:transform-center-y" );
     object->readAttr( "inkscape:connector-avoid" );
     object->readAttr( "inkscape:connection-points" );
+    object->readAttr( "inkscape:highlight-color" );
 
     SPObject::build(document, repr);
 }
@@ -487,11 +518,23 @@ void SPItem::set(unsigned int key, gchar const* value) {
             break;
         }
         case SP_ATTR_SODIPODI_INSENSITIVE:
+        {
             item->sensitive = !value;
             for (SPItemView *v = item->display; v != NULL; v = v->next) {
                 v->arenaitem->setSensitive(item->sensitive);
             }
             break;
+        }
+        case SP_ATTR_INKSCAPE_HIGHLIGHT_COLOR:
+        {
+            g_free(item->_highlightColor);
+            if (value) {
+                item->_highlightColor = g_strdup(value);
+            } else {
+                item->_highlightColor = NULL;
+            }
+            break;
+        }
         case SP_ATTR_CONNECTOR_AVOID:
             item->avoidRef->setAvoid(value);
             break;
@@ -701,6 +744,11 @@ Inkscape::XML::Node* SPItem::write(Inkscape::XML::Document *xml_doc, Inkscape::X
             g_free ((void *) uri);
         }
     }
+    if (item->_highlightColor){
+        repr->setAttribute("inkscape:highlight-color", item->_highlightColor);
+    } else {
+        repr->setAttribute("inkscape:highlight-color", NULL);
+    }
 
     SPObject::write(xml_doc, repr, flags);