From b1fd9e5520ba0578f3b1dbfa53a806bfdb74f3a3 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 3 Oct 2016 00:48:49 +0200
Subject: Doc rotate start

(bzr r15142.1.1)
---
 src/attributes.cpp       |  1 +
 src/attributes.h         |  1 +
 src/document.cpp         |  6 ++++
 src/sp-namedview.cpp     | 47 ++++++++++++++++++++++++++-
 src/sp-namedview.h       |  1 +
 src/ui/dialog/export.cpp | 12 ++++++-
 src/viewbox.cpp          | 82 +++++++++++++++++++++++++++++++++++++++++-------
 src/viewbox.h            | 12 +++++++
 8 files changed, 148 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index b06ff6048..cc75d94c6 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -89,6 +89,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_INKSCAPE_ZOOM, "inkscape:zoom"},
     {SP_ATTR_INKSCAPE_CX, "inkscape:cx"},
     {SP_ATTR_INKSCAPE_CY, "inkscape:cy"},
+    {SP_ATTR_INKSCAPE_DOCUMENT_ROTATION, "inkscape:document-rotation"},
     {SP_ATTR_INKSCAPE_WINDOW_WIDTH, "inkscape:window-width"},
     {SP_ATTR_INKSCAPE_WINDOW_HEIGHT, "inkscape:window-height"},
     {SP_ATTR_INKSCAPE_WINDOW_X, "inkscape:window-x"},
diff --git a/src/attributes.h b/src/attributes.h
index ff426e8cf..ba82c18f1 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -97,6 +97,7 @@ enum SPAttributeEnum {
     SP_ATTR_INKSCAPE_ZOOM,
     SP_ATTR_INKSCAPE_CX,
     SP_ATTR_INKSCAPE_CY,
+    SP_ATTR_INKSCAPE_DOCUMENT_ROTATION,
     SP_ATTR_INKSCAPE_WINDOW_WIDTH,
     SP_ATTR_INKSCAPE_WINDOW_HEIGHT,
     SP_ATTR_INKSCAPE_WINDOW_X,
diff --git a/src/document.cpp b/src/document.cpp
index 920e47cb8..a371fe1e5 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -386,6 +386,7 @@ SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc,
         if (!bordercolor.empty()) {
             rnew->setAttribute("bordercolor", bordercolor.data());
         }
+        sp_repr_set_svg_double(rnew, "inkscape:document-rotation", 0.);
         sp_repr_set_svg_double(rnew, "borderopacity",
             prefs->getDouble("/template/base/borderopacity", 1.0));
         sp_repr_set_svg_double(rnew, "objecttolerance",
@@ -407,6 +408,11 @@ SPDocument *SPDocument::createDoc(Inkscape::XML::Document *rdoc,
         rroot->addChild(rnew, NULL);
         // clean up
         Inkscape::GC::release(rnew);
+    } else {
+        Inkscape::XML::Node *nv_repr = sp_item_group_get_child_by_name(document->root, NULL, "sodipodi:namedview")->getRepr();
+        if (!nv_repr->attribute("inkscape:document-rotation")) {
+            sp_repr_set_svg_double(nv_repr, "inkscape:document-rotation", 0.);
+        }
     }
 
     // Defs
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index b9526433f..69fc78b33 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -29,12 +29,14 @@
 #include "desktop-events.h"
 
 #include "sp-guide.h"
+#include "sp-root.h"
 #include "sp-item-group.h"
 #include "sp-namedview.h"
 #include "preferences.h"
 #include "desktop.h"
+#include "selection.h"
+#include "inkscape.h"
 #include "conn-avoid-ref.h" // for defaultConnSpacing.
-#include "sp-root.h"
 #include <gtkmm/window.h>
 
 using Inkscape::DocumentUndo;
@@ -49,6 +51,7 @@ using Inkscape::Util::unit_table;
 #define DEFAULTPAGECOLOR 0xffffff00
 
 static void sp_namedview_setup_guides(SPNamedView * nv);
+static void sp_namedview_set_document_rotation(SPDocument * doc, SPNamedView * nv);
 static void sp_namedview_lock_guides(SPNamedView * nv);
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show);
 static void sp_namedview_lock_single_guide(SPGuide* guide, bool show);
@@ -72,6 +75,7 @@ SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) {
     this->pagecolor = 0;
     this->cx = 0;
     this->pageshadow = 0;
+    this->document_rotation = 0;
     this->window_width = 0;
     this->window_height = 0;
     this->window_maximized = 0;
@@ -212,6 +216,7 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) {
     this->readAttr( "inkscape:zoom" );
     this->readAttr( "inkscape:cx" );
     this->readAttr( "inkscape:cy" );
+    this->readAttr( "inkscape:document-rotation" );
     this->readAttr( "inkscape:window-width" );
     this->readAttr( "inkscape:window-height" );
     this->readAttr( "inkscape:window-x" );
@@ -409,6 +414,13 @@ void SPNamedView::set(unsigned int key, const gchar* value) {
             this->cy = value ? g_ascii_strtod(value, NULL) : HUGE_VAL; // HUGE_VAL means not set
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
+    case SP_ATTR_INKSCAPE_DOCUMENT_ROTATION:
+            this->document_rotation = value ? g_ascii_strtod(value, NULL) : 0; // zero means not set
+            if (value && document) {
+                sp_namedview_set_document_rotation(document, this);
+            }
+            this->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            break;
     case SP_ATTR_INKSCAPE_WINDOW_WIDTH:
             this->window_width = value? atoi(value) : -1; // -1 means not set
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -939,6 +951,39 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
     }
 }
 
+static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
+{
+    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+    Geom::Rect area;
+    Geom::Point p = Geom::Point();
+    if (desktop) {
+        area = desktop->get_display_area();
+        p = area.midpoint();
+        p *= desktop->doc2dt();
+        p *= doc->getRoot()->rotation.inverse();
+    }
+    doc->getRoot()->set_rotation(nv->document_rotation);
+    if (nv->document_rotation) {
+        nv->showborder = FALSE;
+    } else {
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        nv->showborder = prefs->getBool("/template/base/showborder", 1.0);
+    }
+    if (desktop) {
+        p *= doc->getRoot()->rotation;
+        //desktop->scroll_world_in_svg_coords (p[Geom::X], p[Geom::Y], true);
+        // *= doc->getRoot()->c2p * doc->getRoot()->rotation();
+        //desktop->zoom_absolute (p[Geom::X], p[Geom::Y], desktop->current_zoom());
+        std::cout << p << "pppppp\n";
+//        Geom::Point min_pt = Geom::Point(p[Geom::X] - (area.width() / 2.0), p[Geom::Y] - (area.height() / 2.0));
+//        Geom::Point max_pt = Geom::Point(p[Geom::X] + (area.width() / 2.0), p[Geom::Y] + (area.height() / 2.0));
+//        Geom::Rect const new_area(min_pt, max_pt);
+//        desktop->set_display_area (new_area, 0, false);
+        Inkscape::Selection * sel = desktop->getSelection();
+        sel->clear();
+    }
+}
+
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
 {
     if (show) {
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index d8ac1a77e..9e523632d 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -54,6 +54,7 @@ public:
     double zoom;
     double cx;
     double cy;
+    double document_rotation;
     int window_width;
     int window_height;
     int window_x;
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 64a5d9866..f0d54d784 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -975,7 +975,12 @@ void Export::onExport ()
 
     SPNamedView *nv = desktop->getNamedView();
     SPDocument *doc = desktop->getDocument();
-
+    Geom::Affine rot = doc->getRoot()->c2p;
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    //double rotate_angle = doc->getRoot()->get_rotation();
+    //Inkscape::XML::Node *nv_repr = sp_item_group_get_child_by_name(doc->getRoot(), NULL, "sodipodi:namedview")->getRepr();
+    //sp_repr_set_svg_double(nv_repr, "inkscape:document-rotation", 0.);
+    doc->ensureUpToDate();
     bool exportSuccessful = false;
 
     bool hide = hide_export.get_active ();
@@ -999,6 +1004,7 @@ void Export::onExport ()
 
         if (num < 1) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No items selected."));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1090,6 +1096,7 @@ void Export::onExport ()
         if (filename.empty()) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("You have to enter a filename."));
             sp_ui_error_dialog(_("You have to enter a filename"));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1106,6 +1113,7 @@ void Export::onExport ()
         if (!((x1 > x0) && (y1 > y0) && (width > 0) && (height > 0))) {
             desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("The chosen area to be exported is invalid."));
             sp_ui_error_dialog(_("The chosen area to be exported is invalid"));
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1128,6 +1136,7 @@ void Export::onExport ()
 
             g_free(safeDir);
             g_free(error);
+            doc->getRoot()->c2p *= doc->getRoot()->rotation;
             return;
         }
 
@@ -1277,6 +1286,7 @@ void Export::onExport ()
             }
         }
     }
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 } // end of sp_export_export_clicked()
 
 /// Called when Browse button is clicked
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index 1b50fe71c..e40e477ef 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -17,6 +17,12 @@
 #include "viewbox.h"
 #include "enums.h"
 #include "sp-item.h"
+#include "display/sp-canvas-group.h"
+#include "display/canvas-bpath.h"
+#include "display/curve.h"
+#include "inkscape.h"
+#include "desktop.h"
+
 
 SPViewBox::SPViewBox()
     : viewBox_set(false)
@@ -25,6 +31,8 @@ SPViewBox::SPViewBox()
     , aspect_align(SP_ASPECT_XMID_YMID) // Default per spec
     , aspect_clip(SP_ASPECT_MEET)
     , c2p(Geom::identity())
+    , rotation(Geom::identity())
+    , angle(0)
 {
 }
 
@@ -159,6 +167,14 @@ void SPViewBox::set_preserveAspectRatio(const gchar* value) {
   }
 }
 
+double SPViewBox::get_rotation() {
+    return this->angle;
+}
+
+void SPViewBox::set_rotation(double angle_val) {
+    this->angle = angle_val;
+}
+
 // Apply scaling from viewbox
 void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
 
@@ -224,18 +240,60 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     }
 
     /* Viewbox transform from scale and position */
-    Geom::Affine q;
-    q[0] = scale_x;
-    q[1] = 0.0;
-    q[2] = 0.0;
-    q[3] = scale_y;
-    q[4] = x - scale_x * this->viewBox.left();
-    q[5] = y - scale_y * this->viewBox.top();
-
-    // std::cout << "  q\n" << q << std::endl;
-
-    /* Append viewbox transformation */
-    this->c2p = q * this->c2p;
+    Geom::Affine vbt = Geom::identity();
+    vbt[0] = scale_x;
+    vbt[1] = 0.0;
+    vbt[2] = 0.0;
+    vbt[3] = scale_y;
+    vbt[4] = x - scale_x * this->viewBox.left();
+    vbt[5] = y - scale_y * this->viewBox.top();
+    // std::cout << "  q\n" << q << std::endl
+    /* Append viewbox and turn transformation */
+    if (this->angle > 0.0 || this->angle < 0.0 ) { //!0
+        Geom::Point r0 = this->viewBox.min();
+        Geom::Point r1 = this->viewBox.max();
+        Geom::Point p = (r0 + r1) / 2;
+        SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+        SPCanvasItem *vw_rot = NULL;
+        if (desktop) {
+            if (this->page_border_rotated) {
+                desktop->remove_temporary_canvasitem(this->page_border_rotated);
+                this->page_border_rotated = NULL;
+            }
+            SPCurve *c = new SPCurve();
+            c->moveto(this->viewBox.min());
+            c->lineto(Geom::Point(this->viewBox.max()[Geom::X],this->viewBox.min()[Geom::Y]));
+            c->lineto(Geom::Point(this->viewBox.max()[Geom::X],this->viewBox.max()[Geom::Y]));
+            c->lineto(Geom::Point(this->viewBox.min()[Geom::X],this->viewBox.max()[Geom::Y]));
+            c->closepath();
+            vw_rot = sp_canvas_bpath_new(desktop->getTempGroup(), c, true);
+            sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(vw_rot), 0xFF00009A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+            sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(vw_rot), 0, SP_WIND_RULE_NONZERO);
+            this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
+            Geom::PathVector const box = c->get_pathvector();
+            Geom::OptRect bbox = box.boundsFast();
+            if (bbox){
+                r0 = (*bbox).min();
+                r1 = (*bbox).max();
+                p = (r0 + r1) / 2;
+            }
+            Geom::Affine rot = Geom::identity();
+            rot *= Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(-angle)) * Geom::Translate(p);
+            sp_canvas_item_affine_absolute(vw_rot, rot * vbt);
+            this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
+        }
+        rotation = Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(angle)) * Geom::Translate(p);
+        this->c2p = rotation * vbt * this->c2p;
+    } else {
+        SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+        if (desktop) {
+            if (this->page_border_rotated) {
+                desktop->remove_temporary_canvasitem(this->page_border_rotated);
+                this->page_border_rotated = NULL;
+            }
+        }
+        this->c2p = vbt * this->c2p;
+    }
 }
 
 SPItemCtx SPViewBox::get_rctx(const SPItemCtx* ictx, double scale_none) {
diff --git a/src/viewbox.h b/src/viewbox.h
index c71abb610..df47c025b 100644
--- a/src/viewbox.h
+++ b/src/viewbox.h
@@ -17,6 +17,13 @@
 
 #include <2geom/rect.h>
 #include <glib.h>
+#include "display/sp-canvas.h"
+
+namespace Inkscape {
+    namespace Display {
+        class TemporaryItem;
+    }
+}
 
 class SPItemCtx;
 
@@ -36,6 +43,11 @@ public:
 
   /* Child to parent additional transform */
   Geom::Affine c2p;
+  Geom::Affine rotation;
+  double angle;
+  double get_rotation();
+  void set_rotation(double angle_val);
+  Inkscape::Display::TemporaryItem *page_border_rotated; 
 
   void set_viewBox(const gchar* value);
   void set_preserveAspectRatio(const gchar* value);
-- 
cgit v1.2.3


From f5e77f7f48954ec3bed892fa6763b0ed099a044e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 8 Oct 2016 16:48:24 +0200
Subject: add rotate from current desktop center

(bzr r15142.1.3)
---
 src/sp-namedview.cpp | 40 +++++++++++++++++++++-------------------
 src/viewbox.cpp      | 24 ++++++++++++++++++++----
 src/viewbox.h        |  2 ++
 3 files changed, 43 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 69fc78b33..b4199e4c4 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -39,6 +39,9 @@
 #include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include <gtkmm/window.h>
 
+#include "display/sodipodi-ctrl.h"
+#include "ui/dialog/knot-properties.h"
+
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
 
@@ -416,7 +419,7 @@ void SPNamedView::set(unsigned int key, const gchar* value) {
             break;
     case SP_ATTR_INKSCAPE_DOCUMENT_ROTATION:
             this->document_rotation = value ? g_ascii_strtod(value, NULL) : 0; // zero means not set
-            if (value && document) {
+            if (document) {
                 sp_namedview_set_document_rotation(document, this);
             }
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -950,18 +953,26 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
         sp_namedview_lock_single_guide(*it, nv->lockguides);
     }
 }
-
+void hp2(Geom::Point a) {
+    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    a = desktop->dt2doc(a);
+    guint32 color = 0xff0000ff;
+    SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
+        SP_TYPE_CTRL,
+        "anchor", SP_ANCHOR_CENTER,
+        "size", 8.0,
+        "stroked", TRUE,
+        "stroke_color", color,
+        "mode", SP_KNOT_MODE_XOR,
+        "shape", SP_KNOT_SHAPE_CROSS,
+        NULL );
+
+    SP_CTRL(canvasitem)->moveto(a);
+    sp_canvas_item_show(canvasitem);
+}
 static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
 {
     SPDesktop * desktop = SP_ACTIVE_DESKTOP;
-    Geom::Rect area;
-    Geom::Point p = Geom::Point();
-    if (desktop) {
-        area = desktop->get_display_area();
-        p = area.midpoint();
-        p *= desktop->doc2dt();
-        p *= doc->getRoot()->rotation.inverse();
-    }
     doc->getRoot()->set_rotation(nv->document_rotation);
     if (nv->document_rotation) {
         nv->showborder = FALSE;
@@ -970,15 +981,6 @@ static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
         nv->showborder = prefs->getBool("/template/base/showborder", 1.0);
     }
     if (desktop) {
-        p *= doc->getRoot()->rotation;
-        //desktop->scroll_world_in_svg_coords (p[Geom::X], p[Geom::Y], true);
-        // *= doc->getRoot()->c2p * doc->getRoot()->rotation();
-        //desktop->zoom_absolute (p[Geom::X], p[Geom::Y], desktop->current_zoom());
-        std::cout << p << "pppppp\n";
-//        Geom::Point min_pt = Geom::Point(p[Geom::X] - (area.width() / 2.0), p[Geom::Y] - (area.height() / 2.0));
-//        Geom::Point max_pt = Geom::Point(p[Geom::X] + (area.width() / 2.0), p[Geom::Y] + (area.height() / 2.0));
-//        Geom::Rect const new_area(min_pt, max_pt);
-//        desktop->set_display_area (new_area, 0, false);
         Inkscape::Selection * sel = desktop->getSelection();
         sel->clear();
     }
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index e40e477ef..ba316e2c2 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -23,6 +23,8 @@
 #include "inkscape.h"
 #include "desktop.h"
 
+#include "display/sodipodi-ctrl.h"
+#include "ui/dialog/knot-properties.h"
 
 SPViewBox::SPViewBox()
     : viewBox_set(false)
@@ -33,6 +35,8 @@ SPViewBox::SPViewBox()
     , c2p(Geom::identity())
     , rotation(Geom::identity())
     , angle(0)
+    , previous_angle(0)
+    , rotated(false)
 {
 }
 
@@ -172,6 +176,8 @@ double SPViewBox::get_rotation() {
 }
 
 void SPViewBox::set_rotation(double angle_val) {
+    this->previous_angle = this->angle;
+    this->rotated = true;
     this->angle = angle_val;
 }
 
@@ -255,6 +261,7 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
         Geom::Point p = (r0 + r1) / 2;
         SPDesktop * desktop = SP_ACTIVE_DESKTOP;
         SPCanvasItem *vw_rot = NULL;
+        Geom::Point rot_center = Geom::Point();
         if (desktop) {
             if (this->page_border_rotated) {
                 desktop->remove_temporary_canvasitem(this->page_border_rotated);
@@ -273,17 +280,25 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
             Geom::PathVector const box = c->get_pathvector();
             Geom::OptRect bbox = box.boundsFast();
             if (bbox){
-                r0 = (*bbox).min();
-                r1 = (*bbox).max();
-                p = (r0 + r1) / 2;
+                p = (*bbox).midpoint();
             }
+            Geom::Rect view = desktop->get_display_area();
+            rot_center =  desktop->doc2dt(view.midpoint());
             Geom::Affine rot = Geom::identity();
-            rot *= Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(-angle)) * Geom::Translate(p);
+            rot *= Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(-angle)) *  Geom::Translate(p);
             sp_canvas_item_affine_absolute(vw_rot, rot * vbt);
             this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
+            Geom::Affine rotcenter = Geom::identity();
+            rotcenter *= Geom::Translate(p * vbt).inverse() * Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle)) *  Geom::Translate(p * vbt);
+            rot_center = rot_center * rotcenter;
         }
         rotation = Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(angle)) * Geom::Translate(p);
         this->c2p = rotation * vbt * this->c2p;
+        rot_center =  desktop->dt2doc(rot_center);
+        if (desktop && this->rotated) {
+            desktop->zoom_relative(rot_center[Geom::X], rot_center[Geom::Y], 1.0);
+            this->rotated = false;
+        }
     } else {
         SPDesktop * desktop = SP_ACTIVE_DESKTOP;
         if (desktop) {
@@ -296,6 +311,7 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     }
 }
 
+
 SPItemCtx SPViewBox::get_rctx(const SPItemCtx* ictx, double scale_none) {
 
   /* Create copy of item context */
diff --git a/src/viewbox.h b/src/viewbox.h
index df47c025b..70afa38a1 100644
--- a/src/viewbox.h
+++ b/src/viewbox.h
@@ -45,6 +45,8 @@ public:
   Geom::Affine c2p;
   Geom::Affine rotation;
   double angle;
+  double previous_angle;
+  bool rotated;
   double get_rotation();
   void set_rotation(double angle_val);
   Inkscape::Display::TemporaryItem *page_border_rotated; 
-- 
cgit v1.2.3


From 45b6180786db318dd135ea918732ce8051470e75 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 8 Oct 2016 20:29:16 +0200
Subject: Keep selection

(bzr r15142.1.5)
---
 src/sp-namedview.cpp | 43 +++++++++++++++----------------------------
 src/viewbox.cpp      |  8 ++------
 src/viewbox.h        |  4 ++--
 3 files changed, 19 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index b4199e4c4..e44c548bd 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -35,13 +35,11 @@
 #include "preferences.h"
 #include "desktop.h"
 #include "selection.h"
+#include "object-set.h"
 #include "inkscape.h"
 #include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include <gtkmm/window.h>
 
-#include "display/sodipodi-ctrl.h"
-#include "ui/dialog/knot-properties.h"
-
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
 
@@ -419,9 +417,7 @@ void SPNamedView::set(unsigned int key, const gchar* value) {
             break;
     case SP_ATTR_INKSCAPE_DOCUMENT_ROTATION:
             this->document_rotation = value ? g_ascii_strtod(value, NULL) : 0; // zero means not set
-            if (document) {
-                sp_namedview_set_document_rotation(document, this);
-            }
+            sp_namedview_set_document_rotation(document, this);
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
     case SP_ATTR_INKSCAPE_WINDOW_WIDTH:
@@ -953,26 +949,10 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
         sp_namedview_lock_single_guide(*it, nv->lockguides);
     }
 }
-void hp2(Geom::Point a) {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    a = desktop->dt2doc(a);
-    guint32 color = 0xff0000ff;
-    SPCanvasItem * canvasitem = sp_canvas_item_new(desktop->getTempGroup(),
-        SP_TYPE_CTRL,
-        "anchor", SP_ANCHOR_CENTER,
-        "size", 8.0,
-        "stroked", TRUE,
-        "stroke_color", color,
-        "mode", SP_KNOT_MODE_XOR,
-        "shape", SP_KNOT_SHAPE_CROSS,
-        NULL );
-
-    SP_CTRL(canvasitem)->moveto(a);
-    sp_canvas_item_show(canvasitem);
-}
+
 static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
 {
-    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+    
     doc->getRoot()->set_rotation(nv->document_rotation);
     if (nv->document_rotation) {
         nv->showborder = FALSE;
@@ -980,10 +960,17 @@ static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         nv->showborder = prefs->getBool("/template/base/showborder", 1.0);
     }
-    if (desktop) {
-        Inkscape::Selection * sel = desktop->getSelection();
-        sel->clear();
-    }
+//    //TODO: fix ti for work: To update knots of selected items
+//    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+//    if (desktop) {
+//        Inkscape::Selection * sel = desktop->getSelection();
+//        std::vector<SPItem*> il(sel->items().begin(), sel->items().end());
+//        for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){
+//            SPItem *item = *l;
+//            sel->remove(item->getRepr());
+//            sel->add(item->getRepr());
+//        }
+//    }
 }
 
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index ba316e2c2..dbbd462c8 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -17,15 +17,13 @@
 #include "viewbox.h"
 #include "enums.h"
 #include "sp-item.h"
+#include "sp-root.h"
 #include "display/sp-canvas-group.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 #include "inkscape.h"
 #include "desktop.h"
 
-#include "display/sodipodi-ctrl.h"
-#include "ui/dialog/knot-properties.h"
-
 SPViewBox::SPViewBox()
     : viewBox_set(false)
     , viewBox()
@@ -177,8 +175,8 @@ double SPViewBox::get_rotation() {
 
 void SPViewBox::set_rotation(double angle_val) {
     this->previous_angle = this->angle;
-    this->rotated = true;
     this->angle = angle_val;
+    this->rotated = true;
 }
 
 // Apply scaling from viewbox
@@ -244,7 +242,6 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
           break;
       }
     }
-
     /* Viewbox transform from scale and position */
     Geom::Affine vbt = Geom::identity();
     vbt[0] = scale_x;
@@ -253,7 +250,6 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     vbt[3] = scale_y;
     vbt[4] = x - scale_x * this->viewBox.left();
     vbt[5] = y - scale_y * this->viewBox.top();
-    // std::cout << "  q\n" << q << std::endl
     /* Append viewbox and turn transformation */
     if (this->angle > 0.0 || this->angle < 0.0 ) { //!0
         Geom::Point r0 = this->viewBox.min();
diff --git a/src/viewbox.h b/src/viewbox.h
index 70afa38a1..661a9b24a 100644
--- a/src/viewbox.h
+++ b/src/viewbox.h
@@ -47,10 +47,10 @@ public:
   double angle;
   double previous_angle;
   bool rotated;
-  double get_rotation();
-  void set_rotation(double angle_val);
   Inkscape::Display::TemporaryItem *page_border_rotated; 
 
+  double get_rotation();
+  void set_rotation(double angle_val);
   void set_viewBox(const gchar* value);
   void set_preserveAspectRatio(const gchar* value);
 
-- 
cgit v1.2.3


From 7f008cb2f657420416aef950a1576e1162c89fa4 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 9 Oct 2016 03:19:42 +0200
Subject: Added widget to to rotate

(bzr r15142.1.7)
---
 src/sp-namedview.cpp           |  9 ++++-----
 src/sp-namedview.h             |  2 +-
 src/viewbox.cpp                | 25 +++++++++++------------
 src/widgets/desktop-widget.cpp | 46 +++++++++++++++++++++++++++++++++++++++---
 src/widgets/desktop-widget.h   |  2 +-
 5 files changed, 61 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index e44c548bd..e51d62522 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -416,8 +416,8 @@ void SPNamedView::set(unsigned int key, const gchar* value) {
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
     case SP_ATTR_INKSCAPE_DOCUMENT_ROTATION:
-            this->document_rotation = value ? g_ascii_strtod(value, NULL) : 0; // zero means not set
-            sp_namedview_set_document_rotation(document, this);
+            this->document_rotation = value ? g_ascii_strtod(value, NULL) : 0; 
+            sp_namedview_set_document_rotation(this);
             this->requestModified(SP_OBJECT_MODIFIED_FLAG);
             break;
     case SP_ATTR_INKSCAPE_WINDOW_WIDTH:
@@ -950,10 +950,9 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
     }
 }
 
-static void sp_namedview_set_document_rotation(SPDocument *doc, SPNamedView *nv)
+void sp_namedview_set_document_rotation(SPNamedView *nv)
 {
-    
-    doc->getRoot()->set_rotation(nv->document_rotation);
+    nv->document->getRoot()->set_rotation(nv->document_rotation);
     if (nv->document_rotation) {
         nv->showborder = FALSE;
     } else {
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index 9e523632d..e51908005 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -122,7 +122,7 @@ SPNamedView const *sp_document_namedview(SPDocument const *document, char const
 void sp_namedview_window_from_document(SPDesktop *desktop);
 void sp_namedview_document_from_window(SPDesktop *desktop);
 void sp_namedview_update_layers_from_document (SPDesktop *desktop);
-
+void sp_namedview_set_document_rotation(SPNamedView *nv);
 void sp_namedview_toggle_guides(SPDocument *doc, Inkscape::XML::Node *repr);
 void sp_namedview_guides_toggle_lock(SPDocument *doc, Inkscape::XML::Node *repr);
 void sp_namedview_show_grids(SPNamedView *namedview, bool show, bool dirty_document);
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index dbbd462c8..d4e64a4da 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -251,13 +251,12 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     vbt[4] = x - scale_x * this->viewBox.left();
     vbt[5] = y - scale_y * this->viewBox.top();
     /* Append viewbox and turn transformation */
+    Geom::Point rot_center = Geom::Point();
+    Geom::Point p = this->viewBox.midpoint();
+    Geom::Affine rotcenter = Geom::identity();
+    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
     if (this->angle > 0.0 || this->angle < 0.0 ) { //!0
-        Geom::Point r0 = this->viewBox.min();
-        Geom::Point r1 = this->viewBox.max();
-        Geom::Point p = (r0 + r1) / 2;
-        SPDesktop * desktop = SP_ACTIVE_DESKTOP;
         SPCanvasItem *vw_rot = NULL;
-        Geom::Point rot_center = Geom::Point();
         if (desktop) {
             if (this->page_border_rotated) {
                 desktop->remove_temporary_canvasitem(this->page_border_rotated);
@@ -284,20 +283,15 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
             rot *= Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(-angle)) *  Geom::Translate(p);
             sp_canvas_item_affine_absolute(vw_rot, rot * vbt);
             this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
-            Geom::Affine rotcenter = Geom::identity();
             rotcenter *= Geom::Translate(p * vbt).inverse() * Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle)) *  Geom::Translate(p * vbt);
-            rot_center = rot_center * rotcenter;
         }
         rotation = Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(angle)) * Geom::Translate(p);
         this->c2p = rotation * vbt * this->c2p;
-        rot_center =  desktop->dt2doc(rot_center);
-        if (desktop && this->rotated) {
-            desktop->zoom_relative(rot_center[Geom::X], rot_center[Geom::Y], 1.0);
-            this->rotated = false;
-        }
     } else {
-        SPDesktop * desktop = SP_ACTIVE_DESKTOP;
         if (desktop) {
+            Geom::Rect view = desktop->get_display_area();
+            rot_center =  desktop->doc2dt(view.midpoint());
+            rotcenter *= Geom::Translate(p * vbt).inverse() * Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle)) *  Geom::Translate(p * vbt);
             if (this->page_border_rotated) {
                 desktop->remove_temporary_canvasitem(this->page_border_rotated);
                 this->page_border_rotated = NULL;
@@ -305,6 +299,11 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
         }
         this->c2p = vbt * this->c2p;
     }
+    if (desktop && this->rotated) {
+        rot_center = desktop->dt2doc(rot_center * rotcenter);
+        desktop->zoom_relative(rot_center[Geom::X], rot_center[Geom::Y], 1.0);
+        this->rotated = false;
+    }
 }
 
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 55dc82dc0..df943b241 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -54,7 +54,7 @@
 #include "ui/uxmanager.h"
 #include "util/ege-appear-time-tracker.h"
 #include "sp-root.h"
-
+#include "attributes.h"
 // We're in the "widgets" directory, so no need to explicitly prefix these:
 #include "button.h"
 #include "gimp/ruler.h"
@@ -105,6 +105,7 @@ static void sp_update_guides_lock( GtkWidget *button, gpointer data );
 static void cms_adjust_toggled( GtkWidget *button, gpointer data );
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 static void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled );
+static void sp_desktop_widget_rotate_document(GtkWidget *widget, GdkEvent *eventdtw, SPDesktopWidget *dtw);
 static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw);
 
 static gdouble sp_dtw_zoom_value_to_display (gdouble value);
@@ -1430,6 +1431,12 @@ void SPDesktopWidget::layoutWidgets()
     } else {
         gtk_widget_show_all (dtw->menubar);
     }
+    
+    if (!prefs->getBool(pref_root + "menu/state", true)) {
+        gtk_widget_hide (dtw->rotatebar);
+    } else {
+        gtk_widget_show_all (dtw->rotatebar);
+    }
 
     if (!prefs->getBool(pref_root + "commands/state", true)) {
         gtk_widget_hide (dtw->commands_toolbox);
@@ -1636,8 +1643,25 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     dtw->menubar = sp_ui_main_menubar (dtw->desktop);
     gtk_widget_set_name(dtw->menubar, "MenuBar");
     gtk_widget_show_all (dtw->menubar);
-    gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, FALSE, FALSE, 0);
-
+    SPNamedView *nv = dtw->desktop->namedview;
+    dtw->rotatebar = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,0.0,360.0,45.0);
+    gtk_range_set_value(GTK_RANGE (dtw->rotatebar), nv->document_rotation);
+    gtk_widget_set_name(dtw->rotatebar, "RotateBar");
+    gtk_widget_show_all (dtw->rotatebar);
+    GtkWidget * containermenu = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+    gtk_widget_show_all (containermenu);
+    GtkWidget * separator =  gtk_separator_new (GTK_ORIENTATION_VERTICAL);
+    gtk_widget_show_all(separator);
+    GtkWidget * label =  gtk_label_new (_("Rotation"));
+    gtk_widget_show_all(label);
+    gtk_box_pack_start (GTK_BOX (containermenu), dtw->menubar, FALSE, FALSE, 0);
+    gtk_box_pack_start (GTK_BOX (containermenu), separator, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (containermenu), dtw->rotatebar, TRUE, TRUE, 0);
+    gtk_box_pack_start (GTK_BOX (containermenu), label, FALSE, FALSE, 10);
+    gtk_box_pack_start (GTK_BOX (dtw->vbox), containermenu, TRUE, TRUE, 0);
+    g_signal_connect (G_OBJECT (dtw->rotatebar), "button-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
+    g_signal_connect (G_OBJECT (dtw->rotatebar), "key-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
+    
     dtw->layoutWidgets();
 
     std::vector<GtkWidget *> toolboxes;
@@ -1729,6 +1753,22 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
     }
 }
 
+static void
+sp_desktop_widget_rotate_document(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
+{
+    SPNamedView *nv = dtw->desktop->namedview;
+    double value = gtk_range_get_value(GTK_RANGE(widget));
+    if (value != nv->document_rotation) {
+        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
+        SPObject *updated = nv->document->getObjectByRepr(nv->getRepr());
+        if (updated) {
+            updated->updateRepr();
+        }
+        reinterpret_cast<SPObject *>(dtw->desktop->currentLayer())->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    }
+}
+
+
 static void
 sp_desktop_widget_adjustment_value_changed (GtkAdjustment */*adj*/, SPDesktopWidget *dtw)
 {
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 08966ad5f..26eaf1ff3 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -78,7 +78,7 @@ struct SPDesktopWidget {
 
     GtkWidget *hbox;
 
-    GtkWidget *menubar, *statusbar;
+    GtkWidget *menubar, *statusbar, *rotatebar;
 
     Inkscape::UI::Dialogs::SwatchesPanel *panels;
 
-- 
cgit v1.2.3


From c7f5c676fa15f59f5f78c934263539981a26bbd2 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 10 Oct 2016 14:08:35 +0200
Subject: Fix some canvas problems and refactorization

(bzr r15142.1.8)
---
 src/display/canvas-temporary-item-list.h |  1 +
 src/document-undo.cpp                    |  4 ++
 src/file.cpp                             |  4 +-
 src/sp-namedview.cpp                     | 37 ++++++++++++++++++-
 src/sp-namedview.h                       |  6 ++-
 src/viewbox.cpp                          | 63 ++++++++------------------------
 src/viewbox.h                            |  9 +----
 src/widgets/desktop-widget.cpp           | 41 +++++++++++++++------
 8 files changed, 93 insertions(+), 72 deletions(-)

(limited to 'src')

diff --git a/src/display/canvas-temporary-item-list.h b/src/display/canvas-temporary-item-list.h
index 471bb99b9..6b0e5796b 100644
--- a/src/display/canvas-temporary-item-list.h
+++ b/src/display/canvas-temporary-item-list.h
@@ -14,6 +14,7 @@
 
 struct SPCanvasItem;
 class SPDesktop;
+class SPViewBox;
 
 namespace Inkscape {
 namespace Display {
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 113d09d66..023843fcc 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -281,6 +281,10 @@ gboolean Inkscape::DocumentUndo::undo(SPDocument *doc)
 
 	if (ret)
 		INKSCAPE.external_change();
+    SPObject *updated = doc->getRoot();
+    if (updated) {
+        updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    }
 
 	return ret;
 }
diff --git a/src/file.cpp b/src/file.cpp
index 7c17a6158..5a51bbf52 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -259,8 +259,9 @@ bool sp_file_open(const Glib::ustring &uri,
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop) {
         desktop->setWaitingCursor();
+        desktop->remove_temporary_canvasitem(sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated);
     }
-
+    
     SPDocument *doc = NULL;
     bool cancelled = false;
     try {
@@ -287,7 +288,6 @@ bool sp_file_open(const Glib::ustring &uri,
             doc->setViewBox(Geom::Rect::from_xywh(0, 0, doc->getWidth().value(doc->getDisplayUnit()), doc->getHeight().value(doc->getDisplayUnit())));
             DocumentUndo::setUndoSensitive(doc, true);
         }
-
         SPDocument *existing = desktop ? desktop->getDocument() : NULL;
 
         if (existing && existing->virgin && replace_empty) {
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index e51d62522..ff0ac8336 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -19,7 +19,12 @@
 #include "event-log.h"
 #include <2geom/transforms.h>
 
+#include "display/sp-canvas-group.h"
+#include "display/canvas-bpath.h"
+#include "display/canvas-temporary-item.h"
+#include "display/canvas-temporary-item-list.h"
 #include "display/canvas-grid.h"
+#include "display/curve.h"
 #include "util/units.h"
 #include "svg/svg-color.h"
 #include "xml/repr.h"
@@ -52,7 +57,6 @@ using Inkscape::Util::unit_table;
 #define DEFAULTPAGECOLOR 0xffffff00
 
 static void sp_namedview_setup_guides(SPNamedView * nv);
-static void sp_namedview_set_document_rotation(SPDocument * doc, SPNamedView * nv);
 static void sp_namedview_lock_guides(SPNamedView * nv);
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show);
 static void sp_namedview_lock_single_guide(SPGuide* guide, bool show);
@@ -97,9 +101,13 @@ SPNamedView::SPNamedView() : SPObjectGroup(), snap_manager(this) {
     this->default_layer_id = 0;
 
     this->connector_spacing = defaultConnSpacing;
+    this->page_border_rotated = NULL;
 }
 
 SPNamedView::~SPNamedView() {
+    if(!this->getViewList().empty()) { // >0 Desktops
+        this->getViewList()[0]->remove_temporary_canvasitem(this->page_border_rotated);
+    }
 }
 
 static void sp_namedview_generate_old_grid(SPNamedView * /*nv*/, SPDocument *document, Inkscape::XML::Node *repr) {
@@ -952,7 +960,32 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
 
 void sp_namedview_set_document_rotation(SPNamedView *nv)
 {
-    nv->document->getRoot()->set_rotation(nv->document_rotation);
+    if(!nv->getViewList().empty()) { // >0 Desktops
+        SPDesktop *desktop = nv->getViewList()[0]; 
+        desktop->remove_temporary_canvasitem(nv->page_border_rotated);
+        SPRoot * root = nv->document->getRoot();
+        SPCurve *c = new SPCurve();
+        c->moveto(root->viewBox.min());
+        c->lineto(Geom::Point(root->viewBox.max()[Geom::X],root->viewBox.min()[Geom::Y]));
+        c->lineto(Geom::Point(root->viewBox.max()[Geom::X],root->viewBox.max()[Geom::Y]));
+        c->lineto(Geom::Point(root->viewBox.min()[Geom::X],root->viewBox.max()[Geom::Y]));
+        c->closepath();
+        Geom::Point page_center = root->viewBox.midpoint();
+        Geom::PathVector const box = c->get_pathvector();
+        Geom::Affine rot = Geom::identity();
+        rot *= Geom::Translate(page_center).inverse(); 
+        rot *= Geom::Rotate(Geom::rad_from_deg(nv->document_rotation * -1));
+        rot *=  Geom::Translate(page_center);
+        if (nv->document_rotation) {
+            SPCanvasItem *canvas_border = sp_canvas_bpath_new(desktop->getTempGroup(), c, true);
+            sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(canvas_border), 0xFF00009A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
+            sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(canvas_border), 0, SP_WIND_RULE_NONZERO);
+            sp_canvas_item_affine_absolute(canvas_border, rot * root->vbt);
+            nv->page_border_rotated = desktop->add_temporary_canvasitem(canvas_border, 0); 
+        }
+        nv->document->getRoot()->set_rotation(nv->document_rotation);
+        c->unref();
+    }
     if (nv->document_rotation) {
         nv->showborder = FALSE;
     } else {
diff --git a/src/sp-namedview.h b/src/sp-namedview.h
index e51908005..34f03e67e 100644
--- a/src/sp-namedview.h
+++ b/src/sp-namedview.h
@@ -21,6 +21,7 @@
 #include "snap.h"
 #include "document.h"
 #include "util/units.h"
+#include "display/sp-canvas.h"
 #include <vector>
 
 namespace Inkscape {
@@ -28,6 +29,9 @@ namespace Inkscape {
     namespace Util {
         class Unit;
     }
+    namespace Display {
+        class TemporaryItem;
+    }
 }
 
 typedef unsigned int guint32;
@@ -67,7 +71,7 @@ public:
 
     Inkscape::Util::Unit const *display_units;   // Units used for the UI (*not* the same as units of SVG coordinates)
     Inkscape::Util::Unit const *page_size_units; // Only used in "Custom size" part of Document Properties dialog 
-    
+    Inkscape::Display::TemporaryItem *page_border_rotated;
     GQuark default_layer_id;
 
     double connector_spacing;
diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index d4e64a4da..15b5b19c4 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -17,10 +17,6 @@
 #include "viewbox.h"
 #include "enums.h"
 #include "sp-item.h"
-#include "sp-root.h"
-#include "display/sp-canvas-group.h"
-#include "display/canvas-bpath.h"
-#include "display/curve.h"
 #include "inkscape.h"
 #include "desktop.h"
 
@@ -31,6 +27,7 @@ SPViewBox::SPViewBox()
     , aspect_align(SP_ASPECT_XMID_YMID) // Default per spec
     , aspect_clip(SP_ASPECT_MEET)
     , c2p(Geom::identity())
+    , vbt(Geom::identity())
     , rotation(Geom::identity())
     , angle(0)
     , previous_angle(0)
@@ -243,7 +240,7 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
       }
     }
     /* Viewbox transform from scale and position */
-    Geom::Affine vbt = Geom::identity();
+    vbt = Geom::identity();
     vbt[0] = scale_x;
     vbt[1] = 0.0;
     vbt[2] = 0.0;
@@ -251,57 +248,27 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     vbt[4] = x - scale_x * this->viewBox.left();
     vbt[5] = y - scale_y * this->viewBox.top();
     /* Append viewbox and turn transformation */
-    Geom::Point rot_center = Geom::Point();
-    Geom::Point p = this->viewBox.midpoint();
-    Geom::Affine rotcenter = Geom::identity();
+    Geom::Point page_center = this->viewBox.midpoint();
+    Geom::Affine center_rotation = Geom::identity();
     SPDesktop * desktop = SP_ACTIVE_DESKTOP;
     if (this->angle > 0.0 || this->angle < 0.0 ) { //!0
-        SPCanvasItem *vw_rot = NULL;
         if (desktop) {
-            if (this->page_border_rotated) {
-                desktop->remove_temporary_canvasitem(this->page_border_rotated);
-                this->page_border_rotated = NULL;
-            }
-            SPCurve *c = new SPCurve();
-            c->moveto(this->viewBox.min());
-            c->lineto(Geom::Point(this->viewBox.max()[Geom::X],this->viewBox.min()[Geom::Y]));
-            c->lineto(Geom::Point(this->viewBox.max()[Geom::X],this->viewBox.max()[Geom::Y]));
-            c->lineto(Geom::Point(this->viewBox.min()[Geom::X],this->viewBox.max()[Geom::Y]));
-            c->closepath();
-            vw_rot = sp_canvas_bpath_new(desktop->getTempGroup(), c, true);
-            sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(vw_rot), 0xFF00009A, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT);
-            sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(vw_rot), 0, SP_WIND_RULE_NONZERO);
-            this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
-            Geom::PathVector const box = c->get_pathvector();
-            Geom::OptRect bbox = box.boundsFast();
-            if (bbox){
-                p = (*bbox).midpoint();
-            }
-            Geom::Rect view = desktop->get_display_area();
-            rot_center =  desktop->doc2dt(view.midpoint());
-            Geom::Affine rot = Geom::identity();
-            rot *= Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(-angle)) *  Geom::Translate(p);
-            sp_canvas_item_affine_absolute(vw_rot, rot * vbt);
-            this->page_border_rotated = desktop->add_temporary_canvasitem(vw_rot, 0);
-            rotcenter *= Geom::Translate(p * vbt).inverse() * Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle)) *  Geom::Translate(p * vbt);
+            rotation = Geom::Translate(page_center).inverse() * Geom::Rotate(Geom::rad_from_deg(angle)) * Geom::Translate(page_center);
+            this->c2p = rotation * vbt * this->c2p;
+        } else {
+            this->c2p = vbt * this->c2p;
         }
-        rotation = Geom::Translate(p).inverse() * Geom::Rotate(Geom::rad_from_deg(angle)) * Geom::Translate(p);
-        this->c2p = rotation * vbt * this->c2p;
     } else {
-        if (desktop) {
-            Geom::Rect view = desktop->get_display_area();
-            rot_center =  desktop->doc2dt(view.midpoint());
-            rotcenter *= Geom::Translate(p * vbt).inverse() * Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle)) *  Geom::Translate(p * vbt);
-            if (this->page_border_rotated) {
-                desktop->remove_temporary_canvasitem(this->page_border_rotated);
-                this->page_border_rotated = NULL;
-            }
-        }
         this->c2p = vbt * this->c2p;
     }
     if (desktop && this->rotated) {
-        rot_center = desktop->dt2doc(rot_center * rotcenter);
-        desktop->zoom_relative(rot_center[Geom::X], rot_center[Geom::Y], 1.0);
+        Geom::Rect view = desktop->get_display_area();
+        Geom::Point view_center = desktop->doc2dt(view.midpoint());
+        center_rotation *= Geom::Translate(page_center * vbt).inverse();
+        center_rotation *= Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle));
+        center_rotation *= Geom::Translate(page_center * vbt);
+        view_center = desktop->dt2doc(view_center * center_rotation);
+        desktop->zoom_relative(view_center[Geom::X], view_center[Geom::Y], 1.0);
         this->rotated = false;
     }
 }
diff --git a/src/viewbox.h b/src/viewbox.h
index 661a9b24a..2f107132c 100644
--- a/src/viewbox.h
+++ b/src/viewbox.h
@@ -17,13 +17,6 @@
 
 #include <2geom/rect.h>
 #include <glib.h>
-#include "display/sp-canvas.h"
-
-namespace Inkscape {
-    namespace Display {
-        class TemporaryItem;
-    }
-}
 
 class SPItemCtx;
 
@@ -43,11 +36,11 @@ public:
 
   /* Child to parent additional transform */
   Geom::Affine c2p;
+  Geom::Affine vbt;
   Geom::Affine rotation;
   double angle;
   double previous_angle;
   bool rotated;
-  Inkscape::Display::TemporaryItem *page_border_rotated; 
 
   double get_rotation();
   void set_rotation(double angle_val);
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index df943b241..f648d8430 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1645,7 +1645,6 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     gtk_widget_show_all (dtw->menubar);
     SPNamedView *nv = dtw->desktop->namedview;
     dtw->rotatebar = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,0.0,360.0,45.0);
-    gtk_range_set_value(GTK_RANGE (dtw->rotatebar), nv->document_rotation);
     gtk_widget_set_name(dtw->rotatebar, "RotateBar");
     gtk_widget_show_all (dtw->rotatebar);
     GtkWidget * containermenu = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
@@ -1661,7 +1660,11 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     gtk_box_pack_start (GTK_BOX (dtw->vbox), containermenu, TRUE, TRUE, 0);
     g_signal_connect (G_OBJECT (dtw->rotatebar), "button-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
     g_signal_connect (G_OBJECT (dtw->rotatebar), "key-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
-    
+    gtk_range_set_value(GTK_RANGE (dtw->rotatebar), nv->document_rotation);
+    //TODO: Find a better way to refresh the widget
+    gtk_widget_set_visible (dtw->rotatebar,false);
+    gtk_widget_set_visible (dtw->rotatebar,true);
+    sp_namedview_set_document_rotation(nv);
     dtw->layoutWidgets();
 
     std::vector<GtkWidget *> toolboxes;
@@ -1703,7 +1706,11 @@ sp_desktop_widget_update_rulers (SPDesktopWidget *dtw)
 void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
 {
     SPNamedView *nv=SP_NAMEDVIEW(obj);
-
+    gtk_range_set_value(GTK_RANGE(this->rotatebar), desktop->namedview->document_rotation);
+    sp_namedview_set_document_rotation(nv);
+    //TODO: Find a better way to refresh the widget
+    gtk_widget_set_visible (this->rotatebar,false);
+    gtk_widget_set_visible (this->rotatebar,true);
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         this->dt2r = 1. / nv->display_units->factor;
         this->ruler_origin = Geom::Point(0,0); //nv->gridorigin;   Why was the grid origin used here?
@@ -1756,15 +1763,27 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
 static void
 sp_desktop_widget_rotate_document(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
 {
-    SPNamedView *nv = dtw->desktop->namedview;
-    double value = gtk_range_get_value(GTK_RANGE(widget));
-    if (value != nv->document_rotation) {
-        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
-        SPObject *updated = nv->document->getObjectByRepr(nv->getRepr());
-        if (updated) {
-            updated->updateRepr();
+    if (event->type == GDK_BUTTON_RELEASE ||
+        event->key.keyval == GDK_KEY_Page_Down || 
+        event->key.keyval == GDK_KEY_Page_Up ||
+        event->key.keyval == GDK_KEY_End ||
+        event->key.keyval == GDK_KEY_Begin ||
+        event->key.keyval == GDK_KEY_Up ||
+        event->key.keyval == GDK_KEY_Down ||
+        event->key.keyval == GDK_KEY_Left ||
+        event->key.keyval == GDK_KEY_Right)
+    {
+        SPNamedView *nv = dtw->desktop->namedview;
+        double value = gtk_range_get_value(GTK_RANGE(widget));
+        if (value != nv->document_rotation) {
+            nv->document_rotation = value;
+            sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
+            SPObject *updated = SP_OBJECT(nv);
+            if (updated) {
+                updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+            }
+            gtk_widget_grab_focus(dtw->rotatebar);
         }
-        reinterpret_cast<SPObject *>(dtw->desktop->currentLayer())->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     }
 }
 
-- 
cgit v1.2.3


From b949d0bdb9f751a94fd71f8bab7610d9a6a11a90 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 10 Oct 2016 16:06:22 +0200
Subject: Fix some canvas item problems and refresh items on rotate

(bzr r15142.1.10)
---
 src/document-undo.cpp | 51 +++++++++++++++++++++++++--------------------------
 src/file.cpp          |  4 +++-
 src/sp-namedview.cpp  | 14 ++++++++++----
 3 files changed, 38 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 023843fcc..ae90c916e 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -240,53 +240,52 @@ static void perform_document_update(SPDocument &doc) {
 
 gboolean Inkscape::DocumentUndo::undo(SPDocument *doc)
 {
-	using Inkscape::Debug::EventTracker;
-	using Inkscape::Debug::SimpleEvent;
+    using Inkscape::Debug::EventTracker;
+    using Inkscape::Debug::SimpleEvent;
 
-	gboolean ret;
+    gboolean ret;
 
-	EventTracker<SimpleEvent<Inkscape::Debug::Event::DOCUMENT> > tracker("undo");
+    EventTracker<SimpleEvent<Inkscape::Debug::Event::DOCUMENT> > tracker("undo");
 
-	g_assert (doc != NULL);
-	g_assert (doc->priv != NULL);
-	g_assert (doc->priv->sensitive);
+    g_assert (doc != NULL);
+    g_assert (doc->priv != NULL);
+    g_assert (doc->priv->sensitive);
 
-	doc->priv->sensitive = FALSE;
+    doc->priv->sensitive = FALSE;
         doc->priv->seeking = true;
 
-	doc->actionkey.clear();
+    doc->actionkey.clear();
 
-	finish_incomplete_transaction(*doc);
+    finish_incomplete_transaction(*doc);
 
-	if (! doc->priv->undo.empty()) {
-		Inkscape::Event *log = doc->priv->undo.back();
-		doc->priv->undo.pop_back();
-		sp_repr_undo_log (log->event);
-		perform_document_update(*doc);
+    if (! doc->priv->undo.empty()) {
+	    Inkscape::Event *log = doc->priv->undo.back();
+	    doc->priv->undo.pop_back();
+	    sp_repr_undo_log (log->event);
+	    perform_document_update(*doc);
 
-		doc->priv->redo.push_back(log);
+	    doc->priv->redo.push_back(log);
 
                 doc->setModifiedSinceSave();
                 doc->priv->undoStackObservers.notifyUndoEvent(log);
 
-		ret = TRUE;
-	} else {
-		ret = FALSE;
-	}
+	    ret = TRUE;
+    } else {
+	    ret = FALSE;
+    }
 
-	sp_repr_begin_transaction (doc->rdoc);
+    sp_repr_begin_transaction (doc->rdoc);
 
-	doc->priv->sensitive = TRUE;
+    doc->priv->sensitive = TRUE;
         doc->priv->seeking = false;
 
-	if (ret)
-		INKSCAPE.external_change();
+    if (ret) INKSCAPE.external_change();
+
     SPObject *updated = doc->getRoot();
     if (updated) {
         updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     }
-
-	return ret;
+    return ret;
 }
 
 gboolean Inkscape::DocumentUndo::redo(SPDocument *doc)
diff --git a/src/file.cpp b/src/file.cpp
index 5a51bbf52..324998774 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -257,9 +257,10 @@ bool sp_file_open(const Glib::ustring &uri,
                   bool replace_empty)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+    Inkscape::Display::TemporaryItem *page_border_rotated = NULL;
     if (desktop) {
         desktop->setWaitingCursor();
-        desktop->remove_temporary_canvasitem(sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated);
+        page_border_rotated = sp_document_namedview(desktop->getDocument(), NULL)->page_border_rotated;
     }
     
     SPDocument *doc = NULL;
@@ -295,6 +296,7 @@ bool sp_file_open(const Glib::ustring &uri,
             doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
             desktop->change_document(doc);
             doc->emitResizedSignal(doc->getWidth().value("px"), doc->getHeight().value("px"));
+            desktop->remove_temporary_canvasitem(page_border_rotated);
         } else {
             // create a whole new desktop and window
             SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index ff0ac8336..df0778265 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -960,6 +960,7 @@ static void sp_namedview_lock_guides(SPNamedView *nv)
 
 void sp_namedview_set_document_rotation(SPNamedView *nv)
 {
+    if ( nv->document->getRoot()->get_rotation() == nv->document_rotation) return;
     if(!nv->getViewList().empty()) { // >0 Desktops
         SPDesktop *desktop = nv->getViewList()[0]; 
         desktop->remove_temporary_canvasitem(nv->page_border_rotated);
@@ -992,9 +993,10 @@ void sp_namedview_set_document_rotation(SPNamedView *nv)
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         nv->showborder = prefs->getBool("/template/base/showborder", 1.0);
     }
-//    //TODO: fix ti for work: To update knots of selected items
-//    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
-//    if (desktop) {
+   
+    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
+    if (desktop) {
+//TODO: Remove knots of shapes on selected items
 //        Inkscape::Selection * sel = desktop->getSelection();
 //        std::vector<SPItem*> il(sel->items().begin(), sel->items().end());
 //        for (std::vector<SPItem*>::const_iterator l = il.begin(); l != il.end(); l++){
@@ -1002,7 +1004,11 @@ void sp_namedview_set_document_rotation(SPNamedView *nv)
 //            sel->remove(item->getRepr());
 //            sel->add(item->getRepr());
 //        }
-//    }
+        SPObject *updated = desktop->getDocument()->getRoot();
+        if (updated) {
+            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+        }
+    }
 }
 
 static void sp_namedview_show_single_guide(SPGuide* guide, bool show)
-- 
cgit v1.2.3


From 4b43aeadc203a33bc854bcc40d986b0d1ff5f4f8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Fri, 14 Oct 2016 22:24:30 +0200
Subject: Working with rotate widget

(bzr r15142.1.11)
---
 src/widgets/desktop-widget.cpp | 93 +++++++++++++++++++++++++++++++++++++++++-
 src/widgets/desktop-widget.h   |  2 +
 src/widgets/widget-sizes.h     |  1 +
 3 files changed, 94 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index f648d8430..6d07cbfd3 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -113,6 +113,17 @@ static gdouble sp_dtw_zoom_display_to_value (gdouble value);
 static gint sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data);
 static bool sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data);
 static void sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data);
+static void sp_dtw_rotate_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
+//static void sp_dtw_rotate_menu_handler (SPDesktop *dt, gdouble factor);
+//static void sp_dtw_rotate_minus_135 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_minus_90 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_minus_45 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_0 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_45 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_90 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_135 (GtkMenuItem *item, gpointer data);
+//static void sp_dtw_rotate_180 (GtkMenuItem *item, gpointer data);
+
 static void sp_dtw_zoom_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
 static void sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor);
 static void sp_dtw_zoom_50 (GtkMenuItem *item, gpointer data);
@@ -601,6 +612,20 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_signal_connect (G_OBJECT (dtw->zoom_status), "key-press-event", G_CALLBACK (spinbutton_keypress), dtw->zoom_status);
     dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "value_changed", G_CALLBACK (sp_dtw_zoom_value_changed), dtw);
     dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "populate_popup", G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
+    
+    // Rotate status spinbutton
+    dtw->rotation_status = gtk_spin_button_new_with_range (-180,180, 1.0);
+    gtk_widget_set_name(dtw->rotation_status, "RotationStatus");
+    gtk_widget_set_tooltip_text (dtw->rotation_status, _("Rotation"));
+    gtk_widget_set_size_request (dtw->rotation_status, STATUS_ROTATION_WIDTH, -1);
+    gtk_entry_set_width_chars (GTK_ENTRY (dtw->rotation_status), 6);
+    gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (dtw->rotation_status), FALSE);
+    gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (dtw->rotation_status), GTK_UPDATE_ALWAYS);
+    g_object_set_data (G_OBJECT (dtw->rotation_status), "dtw", dtw->canvas);
+    g_signal_connect (G_OBJECT (dtw->rotation_status), "focus-in-event", G_CALLBACK (spinbutton_focus_in), dtw->rotation_status);
+    g_signal_connect (G_OBJECT (dtw->rotation_status), "key-press-event", G_CALLBACK (spinbutton_keypress), dtw->rotation_status);
+    dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "value_changed", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
+    dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "populate_popup", G_CALLBACK (sp_dtw_rotate_populate_popup), dtw);
 
     // Cursor coordinates
     dtw->coord_status = gtk_grid_new();
@@ -627,12 +652,16 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
 
     auto label_z = gtk_label_new(_("Z:"));
     gtk_widget_set_name(label_z, "ZLabel");
+    auto label_r = gtk_label_new(_("R:"));
+    gtk_widget_set_name(label_r, "RLabel");
     gtk_widget_set_halign(dtw->coord_status_x, GTK_ALIGN_END);
     gtk_widget_set_halign(dtw->coord_status_y, GTK_ALIGN_END);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_x, 2, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_y, 2, 1, 1, 1);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 2);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 1);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_r, 3, 1, 1, 1);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 1);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->rotation_status, 4, 1, 1, 1);
 
     sp_set_font_size_smaller (dtw->coord_status);
 
@@ -700,6 +729,9 @@ static void sp_desktop_widget_dispose(GObject *object)
         g_signal_handlers_disconnect_matched (G_OBJECT (dtw->zoom_status), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, dtw->zoom_status);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_value_changed), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
+        g_signal_handlers_disconnect_matched (G_OBJECT (dtw->rotation_status), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, dtw->rotation_status);
+        g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
+        g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->canvas), (gpointer) G_CALLBACK (sp_desktop_widget_event), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->canvas_tbl), (gpointer) G_CALLBACK (canvas_tbl_size_allocate), dtw);
 
@@ -2006,6 +2038,63 @@ sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 }
 
+
+static void
+sp_dtw_rotate_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
+{
+    GList *children, *iter;
+    GtkWidget *item;
+    SPDesktop *dt = SP_DESKTOP_WIDGET (data)->desktop;
+
+    children = gtk_container_get_children (GTK_CONTAINER (menu));
+    for ( iter = children ; iter ; iter = g_list_next (iter)) {
+        gtk_container_remove (GTK_CONTAINER (menu), GTK_WIDGET (iter->data));
+    }
+    g_list_free (children);
+
+    item = gtk_menu_item_new_with_label ("-180º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_180), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    item = gtk_menu_item_new_with_label ("-135º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_135), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    item = gtk_menu_item_new_with_label ("-90º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_90), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    item = gtk_menu_item_new_with_label ("-45º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_45), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    item = gtk_menu_item_new_with_label ("0º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_0), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    item = gtk_menu_item_new_with_label ("45º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_45), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    
+    item = gtk_menu_item_new_with_label ("90º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_90), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+    
+    
+    item = gtk_menu_item_new_with_label ("135º");
+//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_135), dt);
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+}
+
 static void
 sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor)
 {
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 26eaf1ff3..61c3b8b37 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -97,7 +97,9 @@ struct SPDesktopWidget {
     GtkWidget *select_status;
     GtkWidget *select_status_eventbox;
     GtkWidget *zoom_status;
+    GtkWidget *rotation_status;
     gulong zoom_update;
+    gulong rotation_update;
 
     Inkscape::UI::Widget::Dock *dock;
 
diff --git a/src/widgets/widget-sizes.h b/src/widgets/widget-sizes.h
index 87c7ca2e0..186cf4730 100644
--- a/src/widgets/widget-sizes.h
+++ b/src/widgets/widget-sizes.h
@@ -28,6 +28,7 @@
 #define STATUS_BAR_FONT_SIZE 10000
 
 #define STATUS_ZOOM_WIDTH 57
+#define STATUS_ROTATION_WIDTH 57
 
 #define SELECTED_STYLE_SB_WIDTH 48
 #define SELECTED_STYLE_WIDTH 190
-- 
cgit v1.2.3


From c57802d04d26ecf8618ffe8f1f9a90c79d36ed92 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 15 Oct 2016 01:48:35 +0200
Subject: Change from slider to spin

(bzr r15142.1.13)
---
 src/viewbox.cpp                |   2 +-
 src/widgets/desktop-widget.cpp | 166 +++++++++++++++++++++--------------------
 2 files changed, 88 insertions(+), 80 deletions(-)

(limited to 'src')

diff --git a/src/viewbox.cpp b/src/viewbox.cpp
index 15b5b19c4..ebfc04d8a 100644
--- a/src/viewbox.cpp
+++ b/src/viewbox.cpp
@@ -249,7 +249,6 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     vbt[5] = y - scale_y * this->viewBox.top();
     /* Append viewbox and turn transformation */
     Geom::Point page_center = this->viewBox.midpoint();
-    Geom::Affine center_rotation = Geom::identity();
     SPDesktop * desktop = SP_ACTIVE_DESKTOP;
     if (this->angle > 0.0 || this->angle < 0.0 ) { //!0
         if (desktop) {
@@ -264,6 +263,7 @@ void SPViewBox::apply_viewbox(const Geom::Rect& in, double scale_none) {
     if (desktop && this->rotated) {
         Geom::Rect view = desktop->get_display_area();
         Geom::Point view_center = desktop->doc2dt(view.midpoint());
+        Geom::Affine center_rotation = Geom::identity();
         center_rotation *= Geom::Translate(page_center * vbt).inverse();
         center_rotation *= Geom::Rotate(Geom::rad_from_deg(this->angle - this->previous_angle));
         center_rotation *= Geom::Translate(page_center * vbt);
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 6d07cbfd3..f8ba25191 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -105,7 +105,7 @@ static void sp_update_guides_lock( GtkWidget *button, gpointer data );
 static void cms_adjust_toggled( GtkWidget *button, gpointer data );
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
 static void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled );
-static void sp_desktop_widget_rotate_document(GtkWidget *widget, GdkEvent *eventdtw, SPDesktopWidget *dtw);
+static void sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw);
 static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw);
 
 static gdouble sp_dtw_zoom_value_to_display (gdouble value);
@@ -113,16 +113,15 @@ static gdouble sp_dtw_zoom_display_to_value (gdouble value);
 static gint sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data);
 static bool sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data);
 static void sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data);
-static void sp_dtw_rotate_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
-//static void sp_dtw_rotate_menu_handler (SPDesktop *dt, gdouble factor);
-//static void sp_dtw_rotate_minus_135 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_minus_90 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_minus_45 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_0 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_45 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_90 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_135 (GtkMenuItem *item, gpointer data);
-//static void sp_dtw_rotate_180 (GtkMenuItem *item, gpointer data);
+static void sp_dtw_rotation_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
+static void sp_dtw_rotate_minus_180 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_minus_135 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_minus_90 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_minus_45 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_0 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_45 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_90 (GtkMenuItem *item, SPDesktopWidget * data);
+static void sp_dtw_rotate_135 (GtkMenuItem *item, SPDesktopWidget * data);
 
 static void sp_dtw_zoom_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
 static void sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor);
@@ -624,8 +623,8 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_object_set_data (G_OBJECT (dtw->rotation_status), "dtw", dtw->canvas);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "focus-in-event", G_CALLBACK (spinbutton_focus_in), dtw->rotation_status);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "key-press-event", G_CALLBACK (spinbutton_keypress), dtw->rotation_status);
-    dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "value_changed", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
-    dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "populate_popup", G_CALLBACK (sp_dtw_rotate_populate_popup), dtw);
+    dtw->rotation_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "value_changed", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
+    dtw->rotation_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "populate_popup", G_CALLBACK (sp_dtw_rotation_populate_popup), dtw);
 
     // Cursor coordinates
     dtw->coord_status = gtk_grid_new();
@@ -731,7 +730,7 @@ static void sp_desktop_widget_dispose(GObject *object)
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
         g_signal_handlers_disconnect_matched (G_OBJECT (dtw->rotation_status), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, dtw->rotation_status);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
-        g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
+        g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_dtw_rotation_populate_popup), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->canvas), (gpointer) G_CALLBACK (sp_desktop_widget_event), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->canvas_tbl), (gpointer) G_CALLBACK (canvas_tbl_size_allocate), dtw);
 
@@ -1464,12 +1463,6 @@ void SPDesktopWidget::layoutWidgets()
         gtk_widget_show_all (dtw->menubar);
     }
     
-    if (!prefs->getBool(pref_root + "menu/state", true)) {
-        gtk_widget_hide (dtw->rotatebar);
-    } else {
-        gtk_widget_show_all (dtw->rotatebar);
-    }
-
     if (!prefs->getBool(pref_root + "commands/state", true)) {
         gtk_widget_hide (dtw->commands_toolbox);
     } else {
@@ -1676,29 +1669,10 @@ SPDesktopWidget* SPDesktopWidget::createInstance(SPNamedView *namedview)
     gtk_widget_set_name(dtw->menubar, "MenuBar");
     gtk_widget_show_all (dtw->menubar);
     SPNamedView *nv = dtw->desktop->namedview;
-    dtw->rotatebar = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,0.0,360.0,45.0);
-    gtk_widget_set_name(dtw->rotatebar, "RotateBar");
-    gtk_widget_show_all (dtw->rotatebar);
-    GtkWidget * containermenu = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-    gtk_widget_show_all (containermenu);
-    GtkWidget * separator =  gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-    gtk_widget_show_all(separator);
-    GtkWidget * label =  gtk_label_new (_("Rotation"));
-    gtk_widget_show_all(label);
-    gtk_box_pack_start (GTK_BOX (containermenu), dtw->menubar, FALSE, FALSE, 0);
-    gtk_box_pack_start (GTK_BOX (containermenu), separator, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (containermenu), dtw->rotatebar, TRUE, TRUE, 0);
-    gtk_box_pack_start (GTK_BOX (containermenu), label, FALSE, FALSE, 10);
-    gtk_box_pack_start (GTK_BOX (dtw->vbox), containermenu, TRUE, TRUE, 0);
-    g_signal_connect (G_OBJECT (dtw->rotatebar), "button-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
-    g_signal_connect (G_OBJECT (dtw->rotatebar), "key-release-event", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
-    gtk_range_set_value(GTK_RANGE (dtw->rotatebar), nv->document_rotation);
-    //TODO: Find a better way to refresh the widget
-    gtk_widget_set_visible (dtw->rotatebar,false);
-    gtk_widget_set_visible (dtw->rotatebar,true);
-    sp_namedview_set_document_rotation(nv);
+    gtk_box_pack_start (GTK_BOX (dtw->vbox), dtw->menubar, TRUE, TRUE, 0);
     dtw->layoutWidgets();
-
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON (dtw->rotation_status), namedview->document_rotation);
+    sp_namedview_set_document_rotation(namedview);
     std::vector<GtkWidget *> toolboxes;
     toolboxes.push_back(dtw->tool_toolbox);
     toolboxes.push_back(dtw->aux_toolbox);
@@ -1738,11 +1712,9 @@ sp_desktop_widget_update_rulers (SPDesktopWidget *dtw)
 void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
 {
     SPNamedView *nv=SP_NAMEDVIEW(obj);
-    gtk_range_set_value(GTK_RANGE(this->rotatebar), desktop->namedview->document_rotation);
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(this->rotation_status), desktop->namedview->document_rotation);
     sp_namedview_set_document_rotation(nv);
-    //TODO: Find a better way to refresh the widget
-    gtk_widget_set_visible (this->rotatebar,false);
-    gtk_widget_set_visible (this->rotatebar,true);
+
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         this->dt2r = 1. / nv->display_units->factor;
         this->ruler_origin = Geom::Point(0,0); //nv->gridorigin;   Why was the grid origin used here?
@@ -1793,30 +1765,19 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
 }
 
 static void
-sp_desktop_widget_rotate_document(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw)
-{
-    if (event->type == GDK_BUTTON_RELEASE ||
-        event->key.keyval == GDK_KEY_Page_Down || 
-        event->key.keyval == GDK_KEY_Page_Up ||
-        event->key.keyval == GDK_KEY_End ||
-        event->key.keyval == GDK_KEY_Begin ||
-        event->key.keyval == GDK_KEY_Up ||
-        event->key.keyval == GDK_KEY_Down ||
-        event->key.keyval == GDK_KEY_Left ||
-        event->key.keyval == GDK_KEY_Right)
-    {
-        SPNamedView *nv = dtw->desktop->namedview;
-        double value = gtk_range_get_value(GTK_RANGE(widget));
-        if (value != nv->document_rotation) {
-            nv->document_rotation = value;
-            sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
-            SPObject *updated = SP_OBJECT(nv);
-            if (updated) {
-                updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-            }
-            gtk_widget_grab_focus(dtw->rotatebar);
+sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw)
+{
+    SPNamedView *nv = dtw->desktop->namedview;
+    double value = gtk_spin_button_get_value (spin);
+    if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
+        nv->document_rotation = value;
+        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
+        SPObject *updated = SP_OBJECT(nv);
+        if (updated) {
+            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
         }
     }
+    spinbutton_defocus (GTK_WIDGET(spin));
 }
 
 
@@ -2040,12 +2001,11 @@ sp_dtw_zoom_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
 
 
 static void
-sp_dtw_rotate_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
+sp_dtw_rotation_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
 {
     GList *children, *iter;
     GtkWidget *item;
-    SPDesktop *dt = SP_DESKTOP_WIDGET (data)->desktop;
-
+    SPDesktopWidget *dtw = static_cast<SPDesktopWidget*>(data);
     children = gtk_container_get_children (GTK_CONTAINER (menu));
     for ( iter = children ; iter ; iter = g_list_next (iter)) {
         gtk_container_remove (GTK_CONTAINER (menu), GTK_WIDGET (iter->data));
@@ -2053,48 +2013,96 @@ sp_dtw_rotate_populate_popup (GtkEntry */*entry*/, GtkMenu *menu, gpointer data)
     g_list_free (children);
 
     item = gtk_menu_item_new_with_label ("-180º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_180), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_180), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     item = gtk_menu_item_new_with_label ("-135º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_135), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_135), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     item = gtk_menu_item_new_with_label ("-90º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_90), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_90), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     item = gtk_menu_item_new_with_label ("-45º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_45), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_minus_45), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     item = gtk_menu_item_new_with_label ("0º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_0), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_0), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     item = gtk_menu_item_new_with_label ("45º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_45), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_45), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     
     item = gtk_menu_item_new_with_label ("90º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_90), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_90), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     
     
     item = gtk_menu_item_new_with_label ("135º");
-//    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_135), dt);
+    g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (sp_dtw_rotate_135), dtw);
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 }
 
+static void
+sp_dtw_rotate_minus_180 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status),-180);
+}
+
+static void
+sp_dtw_rotate_minus_135 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), -135);
+}
+
+static void
+sp_dtw_rotate_minus_90 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), -90);
+}
+
+static void
+sp_dtw_rotate_minus_45 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), -45);
+}
+
+static void
+sp_dtw_rotate_0 (GtkMenuItem */*item*/,SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), 0);
+}
+
+static void
+sp_dtw_rotate_45 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), 45);
+}
+
+static void
+sp_dtw_rotate_90 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), 90);
+}
+
+static void
+sp_dtw_rotate_135 (GtkMenuItem */*item*/, SPDesktopWidget * data)
+{
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON((data)->rotation_status), 135);
+}
+
 static void
 sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor)
 {
-- 
cgit v1.2.3


From 3aa73f0b577fd25f64e0414a5cbfa74c076f57be Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 15 Oct 2016 14:27:30 +0200
Subject: Reposition widget and add degree symbol

(bzr r15142.1.14)
---
 src/widgets/desktop-widget.cpp | 60 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index f8ba25191..16d71b4d2 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -108,11 +108,8 @@ static void cms_adjust_set_sensitive( SPDesktopWidget *dtw, bool enabled );
 static void sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw);
 static void sp_desktop_widget_adjustment_value_changed (GtkAdjustment *adj, SPDesktopWidget *dtw);
 
-static gdouble sp_dtw_zoom_value_to_display (gdouble value);
-static gdouble sp_dtw_zoom_display_to_value (gdouble value);
-static gint sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data);
-static bool sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data);
-static void sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data);
+static gint sp_dtw_rotation_input (GtkSpinButton *spin, gdouble *new_val, gpointer data);
+static bool sp_dtw_rotation_output (GtkSpinButton *spin, gpointer data);
 static void sp_dtw_rotation_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
 static void sp_dtw_rotate_minus_180 (GtkMenuItem *item, SPDesktopWidget * data);
 static void sp_dtw_rotate_minus_135 (GtkMenuItem *item, SPDesktopWidget * data);
@@ -122,7 +119,11 @@ static void sp_dtw_rotate_0 (GtkMenuItem *item, SPDesktopWidget * data);
 static void sp_dtw_rotate_45 (GtkMenuItem *item, SPDesktopWidget * data);
 static void sp_dtw_rotate_90 (GtkMenuItem *item, SPDesktopWidget * data);
 static void sp_dtw_rotate_135 (GtkMenuItem *item, SPDesktopWidget * data);
-
+static gdouble sp_dtw_zoom_value_to_display (gdouble value);
+static gdouble sp_dtw_zoom_display_to_value (gdouble value);
+static gint sp_dtw_zoom_input (GtkSpinButton *spin, gdouble *new_val, gpointer data);
+static bool sp_dtw_zoom_output (GtkSpinButton *spin, gpointer data);
+static void sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data);
 static void sp_dtw_zoom_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data);
 static void sp_dtw_zoom_menu_handler (SPDesktop *dt, gdouble factor);
 static void sp_dtw_zoom_50 (GtkMenuItem *item, gpointer data);
@@ -611,21 +612,34 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     g_signal_connect (G_OBJECT (dtw->zoom_status), "key-press-event", G_CALLBACK (spinbutton_keypress), dtw->zoom_status);
     dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "value_changed", G_CALLBACK (sp_dtw_zoom_value_changed), dtw);
     dtw->zoom_update = g_signal_connect (G_OBJECT (dtw->zoom_status), "populate_popup", G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
+    auto css_provider_spinbutton = Gtk::CssProvider::create();
+    css_provider_spinbutton->load_from_data("* { padding-left: 2; padding-right: 2; padding-top: 0; padding-bottom: 0;}");
+    auto zoomstat = Glib::wrap(dtw->zoom_status);
+    zoomstat->set_name("ZoomStatus");
+    auto context_zoom = zoomstat->get_style_context();
+    context_zoom->add_provider(css_provider_spinbutton, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     
     // Rotate status spinbutton
     dtw->rotation_status = gtk_spin_button_new_with_range (-180,180, 1.0);
-    gtk_widget_set_name(dtw->rotation_status, "RotationStatus");
     gtk_widget_set_tooltip_text (dtw->rotation_status, _("Rotation"));
     gtk_widget_set_size_request (dtw->rotation_status, STATUS_ROTATION_WIDTH, -1);
     gtk_entry_set_width_chars (GTK_ENTRY (dtw->rotation_status), 6);
     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (dtw->rotation_status), FALSE);
     gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (dtw->rotation_status), GTK_UPDATE_ALWAYS);
+    g_signal_connect (G_OBJECT (dtw->rotation_status), "input", G_CALLBACK (sp_dtw_rotation_input), dtw);
+    g_signal_connect (G_OBJECT (dtw->rotation_status), "output", G_CALLBACK (sp_dtw_rotation_output), dtw);
     g_object_set_data (G_OBJECT (dtw->rotation_status), "dtw", dtw->canvas);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "focus-in-event", G_CALLBACK (spinbutton_focus_in), dtw->rotation_status);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "key-press-event", G_CALLBACK (spinbutton_keypress), dtw->rotation_status);
     dtw->rotation_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "value_changed", G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
     dtw->rotation_update = g_signal_connect (G_OBJECT (dtw->rotation_status), "populate_popup", G_CALLBACK (sp_dtw_rotation_populate_popup), dtw);
 
+    auto rotstat = Glib::wrap(dtw->rotation_status);
+    rotstat->set_name("RotationStatus");
+    auto context_rotation = rotstat->get_style_context();
+    context_rotation->add_provider(css_provider_spinbutton, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+
     // Cursor coordinates
     dtw->coord_status = gtk_grid_new();
     gtk_widget_set_name(dtw->coord_status, "CoordinateAndZStatus");
@@ -657,10 +671,10 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     gtk_widget_set_halign(dtw->coord_status_y, GTK_ALIGN_END);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_x, 2, 0, 1, 1);
     gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->coord_status_y, 2, 1, 1, 1);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 1);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_r, 3, 1, 1, 1);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 1);
-    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->rotation_status, 4, 1, 1, 1);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_z, 3, 0, 1, 2);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), label_r, 5, 0, 1, 2);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->zoom_status, 4, 0, 1, 2);
+    gtk_grid_attach(GTK_GRID(dtw->coord_status), dtw->rotation_status, 6, 0, 1, 2);
 
     sp_set_font_size_smaller (dtw->coord_status);
 
@@ -728,6 +742,8 @@ static void sp_desktop_widget_dispose(GObject *object)
         g_signal_handlers_disconnect_matched (G_OBJECT (dtw->zoom_status), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, dtw->zoom_status);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_value_changed), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->zoom_status), (gpointer) G_CALLBACK (sp_dtw_zoom_populate_popup), dtw);
+        g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK(sp_dtw_rotation_input), dtw);
+        g_signal_handlers_disconnect_by_func(G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK(sp_dtw_rotation_output), dtw);
         g_signal_handlers_disconnect_matched (G_OBJECT (dtw->rotation_status), G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, dtw->rotation_status);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_desktop_widget_rotate_document), dtw);
         g_signal_handlers_disconnect_by_func (G_OBJECT (dtw->rotation_status), (gpointer) G_CALLBACK (sp_dtw_rotation_populate_popup), dtw);
@@ -1861,6 +1877,28 @@ sp_dtw_zoom_output (GtkSpinButton *spin, gpointer /*data*/)
     return TRUE;
 }
 
+static gint
+sp_dtw_rotation_input (GtkSpinButton *spin, gdouble *new_val, gpointer /*data*/)
+{
+    gdouble new_scrolled = gtk_spin_button_get_value (spin);
+    const gchar *b = gtk_entry_get_text (GTK_ENTRY (spin));
+    gdouble new_typed = atof (b);
+
+    *new_val = new_typed;
+
+    return TRUE;
+}
+
+static bool
+sp_dtw_rotation_output (GtkSpinButton *spin, gpointer /*data*/)
+{
+    gchar b[64];
+    double val = gtk_spin_button_get_value (spin);
+    g_snprintf (b, 64, "%3.0fº", val);
+    gtk_entry_set_text (GTK_ENTRY (spin), b);
+    return TRUE;
+}
+
 static void
 sp_dtw_zoom_value_changed (GtkSpinButton *spin, gpointer data)
 {
-- 
cgit v1.2.3


From f2d2c7740567dcf2452c41d8332380708f557157 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 19 Oct 2016 12:50:29 +0200
Subject: Working with rotate preview

(bzr r15142.1.15)
---
 src/display/sp-canvas.cpp      | 169 ++++++++++++++++++++++++++++++++++++++++-
 src/display/sp-canvas.h        |   4 +-
 src/ui/tools/tool-base.cpp     |   2 -
 src/widgets/desktop-widget.cpp |  24 +++---
 4 files changed, 183 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 9201168ef..36d0b7e7c 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -27,15 +27,19 @@
 #include "helper/sp-marshal.h"
 #include <2geom/rect.h>
 #include <2geom/affine.h>
-#include "display/cairo-utils.h"
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-group.h"
+#include "display/rendermode.h"
+#include "display/cairo-utils.h"
+#include "display/cairo-templates.h"
+#include "display/drawing-context.h"
+#include "display/drawing-item.h"
+#include "display/nr-filter-colormatrix.h"
+#include "display/canvas-arena.h"
 #include "preferences.h"
 #include "inkscape.h"
 #include "sodipodi-ctrlrect.h"
 #include "cms-system.h"
-#include "display/rendermode.h"
-#include "display/cairo-utils.h"
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "color.h"
@@ -1945,6 +1949,165 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll
     }
     addIdle();
 }
+gdouble grayscale_value_matrix[20] = {
+   0.21, 0.72, 0.072, 0, 0,
+   0.21, 0.72, 0.072, 0, 0,
+   0.21, 0.72, 0.072, 0, 0,
+   0   , 0   , 0    , 1, 0
+   };
+cairo_surface_t *surface_rotated;
+cairo_surface_t *surface_origin;
+cairo_surface_t *surface_measure;
+double start_angle = 0;
+bool started = false;
+void SPCanvas::startRotateTo(double angle)
+{
+    if (!_backing_store || started) {
+        return; 
+    }
+    start_angle = angle;
+    started = true;
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(&_widget, &allocation);
+    int half_w = allocation.width/2;
+    int half_h = allocation.height/2;
+    int half_min = std::min(half_w,half_h);
+    cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
+    cairo_t *cr = cairo_create(new_backing_store);
+    cairo_arc(cr, half_w, half_h, half_min-15, 0, 2*M_PI);
+    cairo_fill(cr);
+    cairo_set_operator(cr, CAIRO_OPERATOR_IN);
+    cairo_set_source_surface(cr, _backing_store, 0, 0);
+    cairo_paint(cr);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_arc(cr, half_w, half_h, half_min-16, 0, 2*M_PI);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
+    cairo_stroke(cr);
+    cairo_destroy(cr);
+    surface_rotated = new_backing_store;
+    
+    cairo_surface_t *new_backing_store_measure = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
+    cr = cairo_create(new_backing_store_measure);
+    cairo_arc(cr, half_w, half_h, half_min-15, 0, 2*M_PI);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
+    cairo_fill(cr);
+    cairo_translate(cr, half_w, half_h);
+    for (gint x = 0; x < 360 ; x++){
+        gint ang = 360 - x ;//+ 90;
+        if (ang > 180) {
+            ang -= 360;
+        }
+        double rot = (-180.0 + x - start_angle)*(M_PI/180.);
+        double dist = half_min-9;
+        gint inverse = 1;
+        if((x- start_angle) < 91 || (x- start_angle) > 270) {
+            inverse = -1;
+        }
+        if(x%10 == 0) {
+            cairo_rotate(cr, -rot);
+            cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+            cairo_set_font_size(cr, 10.0);
+            cairo_text_extents_t extents;
+            std::string s = std::to_string(ang) + "º";
+            cairo_text_extents(cr, s.c_str(), &extents);
+            //std::cout << extents.width/2 << "extents.x_bearing\n";
+            cairo_translate(cr, (extents.width/2) * inverse * -1, (dist + ((extents.height/2)* inverse)));
+            if((x- start_angle) < 91 || (x- start_angle) > 270) {
+                cairo_rotate(cr, 180*(M_PI/180.0));
+            }
+            cairo_text_path(cr, s.c_str());
+            if((x- start_angle) < 91 || (x- start_angle) > 270) {
+                cairo_rotate(cr, -180*(M_PI/180.0));
+            }
+            cairo_translate(cr, (extents.width/2) * inverse , (dist + ((extents.height/2)* inverse)) * -1);
+            cairo_set_source_rgba (cr, 1, 1, 1, 1);
+            cairo_fill(cr);
+            cairo_rotate(cr, rot);
+        }
+        cairo_rotate(cr, x*(M_PI/180.));
+        if(x%5 == 0) {
+            cairo_move_to(cr, 0, half_min-30); 
+            cairo_line_to(cr, 0, half_min-17);
+        } else { 
+            cairo_move_to(cr, 0, half_min-20);
+            cairo_line_to(cr, 0, half_min-15); 
+        }
+        cairo_line_to(cr, 0, half_min-15);
+        cairo_set_source_rgba (cr, 0, 0, 0, 0.4);
+        cairo_set_line_width (cr,1);
+        cairo_stroke(cr);
+        cairo_rotate(cr, -x*(M_PI/180.));
+    }
+    cairo_set_operator(cr, CAIRO_OPERATOR_CLEAR);
+    cairo_translate(cr, -half_w, -half_h);
+    cairo_arc(cr, half_w, half_h, half_min-30, 0, 2*M_PI);
+    cairo_set_source_rgba (cr, 1, 1, 1, 1);
+    cairo_fill(cr);
+    cairo_destroy(cr);
+    surface_measure = new_backing_store_measure;
+
+    cairo_surface_t *new_backing_store_grey = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
+    cr = cairo_create(new_backing_store_grey);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_set_source_surface(cr, _backing_store, 0, 0);
+    cairo_paint(cr);
+    Inkscape::Filters::FilterColorMatrix::ColorMatrixMatrix _grayscale_colormatrix = std::vector<gdouble> (grayscale_value_matrix, grayscale_value_matrix + 20);
+    cairo_surface_t *out = ink_cairo_surface_create_identical(new_backing_store_grey);
+    ink_cairo_surface_filter(new_backing_store_grey, out, _grayscale_colormatrix);
+    cairo_set_source_surface(cr, out, 0, 0);
+    cairo_surface_destroy(out);
+    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+    surface_origin  = new_backing_store_grey;
+
+}
+
+void SPCanvas::endRotateTo()
+{
+    if (!_backing_store) {
+        return; 
+    }
+    started = false;
+    surface_rotated = NULL;
+    surface_origin  = NULL;
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    dirtyAll();
+    addIdle();
+}
+
+void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
+{
+    if (!_backing_store) {
+        return; 
+    }
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(&_widget, &allocation);
+    cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
+    cairo_t *cr = cairo_create(new_backing_store);
+    cairo_set_source_surface(cr, surface_origin, 0, 0);
+    cairo_paint(cr);
+    cairo_set_source_rgba (cr, 0, 0, 0, 0.5);
+    cairo_paint(cr);
+    cairo_pattern_t *source_pattern;
+    cairo_matrix_t matrix;
+    source_pattern = cairo_pattern_create_for_surface (surface_rotated);
+    cairo_matrix_init_identity (&matrix);
+    cairo_matrix_translate (&matrix, allocation.width/2.0, allocation.height/2.0);
+    cairo_matrix_rotate (&matrix, Geom::rad_from_deg(angle - start_angle) * -1);
+    cairo_matrix_translate (&matrix, -allocation.width/2.0, -allocation.height/2.0);
+    cairo_pattern_set_matrix (source_pattern, &matrix);
+    cairo_set_source(cr, source_pattern);
+    cairo_paint(cr);
+    cairo_set_source_surface(cr, surface_measure, 0, 0);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+    cairo_surface_destroy(_backing_store);
+    _backing_store = new_backing_store;
+    cairo_pattern_destroy (source_pattern);
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    addIdle();
+}
 
 void SPCanvas::updateNow()
 {
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 78d96d728..b78cdcdd5 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -72,7 +72,9 @@ GType sp_canvas_get_type() G_GNUC_CONST;
 struct SPCanvas {
     /// Scrolls canvas to specific position (cx and cy are measured in screen pixels).
     void scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling = false);
-
+    void startRotateTo(double angle);
+    void rotateTo(SPCanvasItem * item, double angle);
+    void endRotateTo();
     /// Synchronously updates the canvas if necessary.
     void updateNow();
 
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 8a35882b9..128a09878 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -345,7 +345,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
             /* sp_desktop_dialog(); */
         }
         break;
-
     case GDK_BUTTON_PRESS:
         // save drag origin
         xp = (gint) event->button.x;
@@ -446,7 +445,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     // do not drag if we're within tolerance from origin
                     break;
                 }
-
                 // Once the user has moved farther than tolerance from
                 // the original location (indicating they intend to move
                 // the object, not click), then always process the motion
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 16d71b4d2..e868dd2d6 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -62,7 +62,6 @@
 #include "spw-utilities.h"
 #include "toolbox.h"
 #include "widget-sizes.h"
-
 #include "verbs.h"
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/paned.h>
@@ -1785,15 +1784,20 @@ sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw)
 {
     SPNamedView *nv = dtw->desktop->namedview;
     double value = gtk_spin_button_get_value (spin);
-    if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
-        nv->document_rotation = value;
-        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
-        SPObject *updated = SP_OBJECT(nv);
-        if (updated) {
-            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-        }
-    }
-    spinbutton_defocus (GTK_WIDGET(spin));
+//    if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
+//        nv->document_rotation = value;
+//        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
+//        SPObject *updated = SP_OBJECT(nv);
+//        if (updated) {
+//            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+//        }
+//        //dtw->desktop->canvas->endRotateTo();
+//    } else if( value != nv->document_rotation ) {
+        dtw->desktop->canvas->startRotateTo(0);
+        dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
+        if (value == 180) { dtw->desktop->canvas->endRotateTo();}
+//   }
+   spinbutton_defocus (GTK_WIDGET(spin));
 }
 
 
-- 
cgit v1.2.3


From ab9795b860412f259eecc095225893b9b130bc42 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 19 Oct 2016 22:02:50 +0200
Subject: Styling rotate

(bzr r15142.1.17)
---
 src/display/sp-canvas.cpp | 53 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 36d0b7e7c..ae20cd92d 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1997,10 +1997,10 @@ void SPCanvas::startRotateTo(double angle)
         if (ang > 180) {
             ang -= 360;
         }
-        double rot = (-180.0 + x - start_angle)*(M_PI/180.);
+        double rot = (-180.0 + x)*(M_PI/180.);
         double dist = half_min-9;
         gint inverse = 1;
-        if((x- start_angle) < 91 || (x- start_angle) > 270) {
+        if((x) < 91 || (x) > 270) {
             inverse = -1;
         }
         if(x%10 == 0) {
@@ -2012,11 +2012,11 @@ void SPCanvas::startRotateTo(double angle)
             cairo_text_extents(cr, s.c_str(), &extents);
             //std::cout << extents.width/2 << "extents.x_bearing\n";
             cairo_translate(cr, (extents.width/2) * inverse * -1, (dist + ((extents.height/2)* inverse)));
-            if((x- start_angle) < 91 || (x- start_angle) > 270) {
+            if((x) < 91 || (x) > 270) {
                 cairo_rotate(cr, 180*(M_PI/180.0));
             }
             cairo_text_path(cr, s.c_str());
-            if((x- start_angle) < 91 || (x- start_angle) > 270) {
+            if((x) < 91 || (x) > 270) {
                 cairo_rotate(cr, -180*(M_PI/180.0));
             }
             cairo_translate(cr, (extents.width/2) * inverse , (dist + ((extents.height/2)* inverse)) * -1);
@@ -2043,6 +2043,21 @@ void SPCanvas::startRotateTo(double angle)
     cairo_arc(cr, half_w, half_h, half_min-30, 0, 2*M_PI);
     cairo_set_source_rgba (cr, 1, 1, 1, 1);
     cairo_fill(cr);
+    cairo_translate(cr, half_w, half_h);
+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+    cairo_rotate(cr, start_angle*(M_PI/180.));
+    cairo_move_to(cr, 0, 0); 
+    cairo_line_to(cr, 0, (half_min-17) * -1);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); 
+    cairo_set_line_width (cr,5);
+    cairo_stroke(cr);
+    cairo_move_to(cr, 0, 0); 
+    cairo_line_to(cr, 0, (half_min-17) * -1);
+    cairo_set_source_rgba (cr, 1, 0, 0, 0.9);
+    cairo_set_line_width (cr,1);
+    cairo_stroke(cr);
+    cairo_rotate(cr, -start_angle*(M_PI/180.));
     cairo_destroy(cr);
     surface_measure = new_backing_store_measure;
 
@@ -2083,6 +2098,9 @@ void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
     }
     GtkAllocation allocation;
     gtk_widget_get_allocation(&_widget, &allocation);
+    int half_w = allocation.width/2;
+    int half_h = allocation.height/2;
+    int half_min = std::min(half_w,half_h);
     cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
     cairo_t *cr = cairo_create(new_backing_store);
     cairo_set_source_surface(cr, surface_origin, 0, 0);
@@ -2101,6 +2119,33 @@ void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
     cairo_paint(cr);
     cairo_set_source_surface(cr, surface_measure, 0, 0);
     cairo_paint(cr);
+    cairo_translate(cr, half_w, half_h);
+    cairo_rotate(cr, angle*(M_PI/180.));
+    cairo_move_to(cr, 0, 0); 
+    cairo_line_to(cr, 0, (half_min-17) * -1);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
+    cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND); 
+    cairo_set_line_width (cr,5);
+    cairo_stroke(cr);
+    cairo_move_to(cr, 0, 0); 
+    cairo_line_to(cr, 0, (half_min-17) * -1);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.9);
+    cairo_set_line_width (cr,1);
+    cairo_stroke(cr);
+    cairo_move_to(cr, 0, 0); 
+    cairo_line_to(cr, 0, (half_min-17) * -1);
+    cairo_set_source_rgba (cr, 1, 0, 0, 0.9);
+    const double dashed[] = {6.0, 3.0};
+    int len  = sizeof(dashed) / sizeof(dashed[0]);
+    cairo_set_dash(cr, dashed, len, 1);
+    cairo_stroke(cr);
+    cairo_translate(cr, -half_w, -half_h);
+    cairo_set_source_rgba (cr, 1, 1, 1, 0.25);
+    cairo_arc(cr, half_w, half_h, 7, 0, 2*M_PI);
+    cairo_fill(cr);
+    cairo_set_source_rgba (cr, 1, 0, 0, 0.7);
+    cairo_arc(cr, half_w, half_h, 5, 0, 2*M_PI);
+    cairo_fill(cr);
     cairo_destroy(cr);
     cairo_surface_destroy(_backing_store);
     _backing_store = new_backing_store;
-- 
cgit v1.2.3


From 50c101849a9f591972b5478a7a83407558e7bff7 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 23 Oct 2016 11:03:35 +0200
Subject: Add right click attempt

(bzr r15142.1.20)
---
 src/display/sp-canvas.cpp      |  68 ++++++++++++-
 src/display/sp-canvas.h        |   2 +-
 src/ui/tools/tool-base.cpp     | 216 ++++++++++++++++++++++++-----------------
 src/widgets/desktop-widget.cpp |  34 +++----
 4 files changed, 207 insertions(+), 113 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index ae20cd92d..745896dd7 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -43,6 +43,8 @@
 #include "debug/gdk-event-latency-tracker.h"
 #include "desktop.h"
 #include "color.h"
+#include <iomanip>
+#include <glibmm/i18n.h>
 
 using Inkscape::Debug::GdkEventLatencyTracker;
 
@@ -1992,6 +1994,8 @@ void SPCanvas::startRotateTo(double angle)
     cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
     cairo_fill(cr);
     cairo_translate(cr, half_w, half_h);
+    cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, 10.0);
     for (gint x = 0; x < 360 ; x++){
         gint ang = 360 - x ;//+ 90;
         if (ang > 180) {
@@ -2005,8 +2009,6 @@ void SPCanvas::startRotateTo(double angle)
         }
         if(x%10 == 0) {
             cairo_rotate(cr, -rot);
-            cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-            cairo_set_font_size(cr, 10.0);
             cairo_text_extents_t extents;
             std::string s = std::to_string(ang) + "º";
             cairo_text_extents(cr, s.c_str(), &extents);
@@ -2075,7 +2077,9 @@ void SPCanvas::startRotateTo(double angle)
     cairo_paint(cr);
     cairo_destroy(cr);
     surface_origin  = new_backing_store_grey;
-
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    dirtyAll();
+    addIdle();
 }
 
 void SPCanvas::endRotateTo()
@@ -2091,9 +2095,9 @@ void SPCanvas::endRotateTo()
     addIdle();
 }
 
-void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
+void SPCanvas::rotateTo(SPCanvasItem * item, double angle, bool widget)
 {
-    if (!_backing_store) {
+    if (!_backing_store || !started) {
         return; 
     }
     GtkAllocation allocation;
@@ -2146,6 +2150,60 @@ void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
     cairo_set_source_rgba (cr, 1, 0, 0, 0.7);
     cairo_arc(cr, half_w, half_h, 5, 0, 2*M_PI);
     cairo_fill(cr);
+    cairo_translate(cr, half_w, half_h);
+    cairo_rotate(cr, -angle*(M_PI/180.));
+    if (!widget) {
+        cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+        cairo_set_font_size(cr, 15.0);
+        cairo_text_extents_t extents;
+        std::ostringstream s;
+        s << _("Original angle ") << std::fixed << std::setprecision(2) << start_angle << "º";
+        cairo_text_extents(cr, s.str().c_str(), &extents);
+        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 25);
+        cairo_set_source_rgba (cr, 1, 1, 1, 1);
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 25) *-1);
+        s.str("");
+        s << _("New angle ") << std::fixed << std::setprecision(2) << angle << "º";
+        cairo_text_extents(cr, s.str().c_str(), &extents);
+        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 45);
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 45) *-1);
+        s.str("");
+        s << _("Gap ") << std::fixed << std::setprecision(2) << std::abs(start_angle-angle) << "º";
+        cairo_text_extents(cr, s.str().c_str(), &extents);
+        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 65);
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 65) *-1);
+        cairo_translate(cr, -half_w + 10 ,-half_h + 25);
+        s.str("");
+        cairo_set_font_size(cr, 12.0);
+        s << _("Normal mode, 1º round step");
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (-half_w +10) * -1 ,(-half_h + 25) * -1);
+        cairo_translate(cr, -half_w + 10 ,-half_h + 40);
+        s.str("");
+        s << _("+CTRL, Fractional degrees");
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 40) * -1);
+        cairo_translate(cr, -half_w + 10 ,-half_h + 55);
+        s.str("");
+        s << _("+SHIFT, 5º round step");
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 55) * -1);
+        cairo_translate(cr, -half_w + 10 ,-half_h + 70);
+        s.str("");
+        s << _("+ALT, Reset");
+        cairo_text_path(cr, s.str().c_str());
+        cairo_fill(cr);
+        //cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 60) * -1);
+    }
     cairo_destroy(cr);
     cairo_surface_destroy(_backing_store);
     _backing_store = new_backing_store;
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index b78cdcdd5..5c4cd5047 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -73,7 +73,7 @@ struct SPCanvas {
     /// Scrolls canvas to specific position (cx and cy are measured in screen pixels).
     void scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling = false);
     void startRotateTo(double angle);
-    void rotateTo(SPCanvasItem * item, double angle);
+    void rotateTo(SPCanvasItem * item, double angle, bool widget = false);
     void endRotateTo();
     /// Synchronously updates the canvas if necessary.
     void updateNow();
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 128a09878..d8800284b 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -327,6 +327,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
     static unsigned int panning = 0;
     static unsigned int panning_cursor = 0;
     static unsigned int zoom_rb = 0;
+    static double angle = 0;
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
@@ -345,6 +346,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
             /* sp_desktop_dialog(); */
         }
         break;
+
     case GDK_BUTTON_PRESS:
         // save drag origin
         xp = (gint) event->button.x;
@@ -393,21 +395,25 @@ bool ToolBase::root_handler(GdkEvent* event) {
             break;
 
         case 3:
-            if ((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK)) {
-                // When starting panning, make sure there are no snap events pending because these might disable the panning again
-                if (_uses_snap) {
-                    sp_event_context_discard_delayed_snap_event(this);
-                }
-                panning = 3;
-
-                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                        GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
-                                | GDK_POINTER_MOTION_HINT_MASK, NULL,
-                        event->button.time);
-
-                ret = TRUE;
-            } else {
+//            if ((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK)) {
+//                // When starting panning, make sure there are no snap events pending because these might disable the panning again
+//                if (_uses_snap) {
+//                    sp_event_context_discard_delayed_snap_event(this);
+//                }
+//                panning = 3;
+
+//                sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+//                        GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
+//                                | GDK_POINTER_MOTION_HINT_MASK, NULL,
+//                        event->button.time);
+
+//                ret = TRUE;
+//            } else 
+            if( !this->space_panning ) {
                 sp_event_root_menu_popup(desktop, NULL, event);
+            } else {
+                panning = 5;
+                desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
             }
             break;
 
@@ -418,7 +424,27 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
     case GDK_MOTION_NOTIFY:
         if (panning) {
-            if (panning == 4 && !xp && !yp ) {
+            if (panning == 5) {
+                button_w = Geom::Point(event->motion.x, event->motion.y);
+                Geom::Point const motion_dt(desktop->w2d(button_w));
+                Geom::Rect view = desktop->get_display_area();
+                Geom::Point view_center = desktop->doc2dt(view.midpoint());
+                Geom::Ray center_ray(motion_dt,view_center);
+                if (event->motion.state & GDK_BUTTON3_MASK) {
+                    desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
+                    if (event->motion.state & GDK_SHIFT_MASK) {
+                        angle = floor(center_ray.angle()/5) * 5;
+                    } else if (event->motion.state & GDK_CONTROL_MASK) {
+                        angle = center_ray.angle();
+                    } else if (event->motion.state & GDK_KEY_Alt_L ||
+                              event->motion.state & GDK_KEY_Alt_R){
+                        angle = desktop->namedview->document_rotation;
+                    } else {
+                        angle = floor(center_ray.angle());
+                    }
+                    desktop->canvas->rotateTo(desktop->getDrawing(), angle);
+                }
+            } else if (panning == 4 && !xp && !yp ) {
                 // <Space> + mouse panning started, save location and grab canvas
                 xp = event->motion.x;
                 yp = event->motion.y;
@@ -430,41 +456,43 @@ bool ToolBase::root_handler(GdkEvent* event) {
                                 | GDK_POINTER_MOTION_HINT_MASK, NULL,
                         event->motion.time - 1);
             }
+            if (panning != 5) {
+                if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK))
+                        || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK))
+                        || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) {
+                    /* Gdk seems to lose button release for us sometimes :-( */
+                    panning = 0;
+                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
+                    ret = TRUE;
+                } else {
+                    if (within_tolerance && (abs((gint) event->motion.x - xp)
+                            < tolerance) && (abs((gint) event->motion.y - yp)
+                            < tolerance)) {
+                        // do not drag if we're within tolerance from origin
+                        break;
+                    }
 
-            if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK))
-                    || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK))
-                    || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) {
-                /* Gdk seems to lose button release for us sometimes :-( */
-                panning = 0;
-                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
-                ret = TRUE;
-            } else {
-                if (within_tolerance && (abs((gint) event->motion.x - xp)
-                        < tolerance) && (abs((gint) event->motion.y - yp)
-                        < tolerance)) {
-                    // do not drag if we're within tolerance from origin
-                    break;
-                }
-                // Once the user has moved farther than tolerance from
-                // the original location (indicating they intend to move
-                // the object, not click), then always process the motion
-                // notify coordinates as given (no snapping back to origin)
-                within_tolerance = false;
-
-                // gobble subsequent motion events to prevent "sticking"
-                // when scrolling is slow
-                gobble_motion_events(panning == 2 ? GDK_BUTTON2_MASK : (panning
-                        == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK));
-
-                if (panning_cursor == 0) {
-                    panning_cursor = 1;
-                    this->sp_event_context_set_cursor(GDK_FLEUR);
-                }
+                    // Once the user has moved farther than tolerance from
+                    // the original location (indicating they intend to move
+                    // the object, not click), then always process the motion
+                    // notify coordinates as given (no snapping back to origin)
+                    within_tolerance = false;
 
-                Geom::Point const motion_w(event->motion.x, event->motion.y);
-                Geom::Point const moved_w(motion_w - button_w);
-                this->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw
-                ret = TRUE;
+                    // gobble subsequent motion events to prevent "sticking"
+                    // when scrolling is slow
+                    gobble_motion_events(panning == 2 ? GDK_BUTTON2_MASK : (panning
+                            == 1 ? GDK_BUTTON1_MASK : GDK_BUTTON3_MASK));
+
+                    if (panning_cursor == 0) {
+                        panning_cursor = 1;
+                        this->sp_event_context_set_cursor(GDK_FLEUR);
+                    }
+
+                    Geom::Point const motion_w(event->motion.x, event->motion.y);
+                    Geom::Point const moved_w(motion_w - button_w);
+                    this->desktop->scroll_world(moved_w, true); // we're still scrolling, do not redraw
+                    ret = TRUE;
+                }
             }
         } else if (zoom_rb) {
             Geom::Point const motion_w(event->motion.x, event->motion.y);
@@ -494,60 +522,68 @@ bool ToolBase::root_handler(GdkEvent* event) {
         break;
 
     case GDK_BUTTON_RELEASE:
-        xp = yp = 0;
+        if (panning == 5) {
+            desktop->canvas->endRotateTo();
+            sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle);
+            SPObject *updated = SP_OBJECT(desktop->namedview);
+            if (updated) {
+                updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+            }
+        } else {
+            xp = yp = 0;
+            if (panning_cursor == 1) {
+                panning_cursor = 0;
+                GtkWidget *w = GTK_WIDGET(this->desktop->getCanvas());
+                gdk_window_set_cursor(gtk_widget_get_window (w), this->cursor);
+            }
 
-        if (panning_cursor == 1) {
-            panning_cursor = 0;
-            GtkWidget *w = GTK_WIDGET(this->desktop->getCanvas());
-            gdk_window_set_cursor(gtk_widget_get_window (w), this->cursor);
-        }
+            if (within_tolerance && (panning || zoom_rb)) {
+                zoom_rb = 0;
 
-        if (within_tolerance && (panning || zoom_rb)) {
-            zoom_rb = 0;
+                if (panning) {
+                    panning = 0;
+                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                            event->button.time);
+                }
 
-            if (panning) {
-                panning = 0;
-                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                        event->button.time);
-            }
+                Geom::Point const event_w(event->button.x, event->button.y);
+                Geom::Point const event_dt(desktop->w2d(event_w));
 
-            Geom::Point const event_w(event->button.x, event->button.y);
-            Geom::Point const event_dt(desktop->w2d(event_w));
+                double const zoom_inc = prefs->getDoubleLimited(
+                        "/options/zoomincrement/value", M_SQRT2, 1.01, 10);
 
-            double const zoom_inc = prefs->getDoubleLimited(
-                    "/options/zoomincrement/value", M_SQRT2, 1.01, 10);
+                desktop->zoom_relative_keep_point(event_dt, (event->button.state
+                        & GDK_SHIFT_MASK) ? 1 / zoom_inc : zoom_inc);
 
-            desktop->zoom_relative_keep_point(event_dt, (event->button.state
-                    & GDK_SHIFT_MASK) ? 1 / zoom_inc : zoom_inc);
+                desktop->updateNow();
+                ret = TRUE;
+            } else if (panning == event->button.button) {
+                panning = 0;
+                sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                        event->button.time);
 
-            desktop->updateNow();
-            ret = TRUE;
-        } else if (panning == event->button.button) {
-            panning = 0;
-            sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
-                    event->button.time);
+                // in slow complex drawings, some of the motion events are lost;
+                // to make up for this, we scroll it once again to the button-up event coordinates
+                // (i.e. canvas will always get scrolled all the way to the mouse release point,
+                // even if few intermediate steps were visible)
+                Geom::Point const motion_w(event->button.x, event->button.y);
+                Geom::Point const moved_w(motion_w - button_w);
 
-            // in slow complex drawings, some of the motion events are lost;
-            // to make up for this, we scroll it once again to the button-up event coordinates
-            // (i.e. canvas will always get scrolled all the way to the mouse release point,
-            // even if few intermediate steps were visible)
-            Geom::Point const motion_w(event->button.x, event->button.y);
-            Geom::Point const moved_w(motion_w - button_w);
+                this->desktop->scroll_world(moved_w);
+                desktop->updateNow();
+                ret = TRUE;
+            } else if (zoom_rb == event->button.button) {
+                zoom_rb = 0;
 
-            this->desktop->scroll_world(moved_w);
-            desktop->updateNow();
-            ret = TRUE;
-        } else if (zoom_rb == event->button.button) {
-            zoom_rb = 0;
+                Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle();
+                Inkscape::Rubberband::get(desktop)->stop();
 
-            Geom::OptRect const b = Inkscape::Rubberband::get(desktop)->getRectangle();
-            Inkscape::Rubberband::get(desktop)->stop();
+                if (b && !within_tolerance) {
+                    desktop->set_display_area(*b, 10);
+                }
 
-            if (b && !within_tolerance) {
-                desktop->set_display_area(*b, 10);
+                ret = TRUE;
             }
-
-            ret = TRUE;
         }
         break;
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index e868dd2d6..bc08c4f58 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -619,11 +619,12 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     context_zoom->add_provider(css_provider_spinbutton, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
     
     // Rotate status spinbutton
-    dtw->rotation_status = gtk_spin_button_new_with_range (-180,180, 1.0);
+    dtw->rotation_status = gtk_spin_button_new_with_range (-360.0,360.0, 1.0);
     gtk_widget_set_tooltip_text (dtw->rotation_status, _("Rotation"));
     gtk_widget_set_size_request (dtw->rotation_status, STATUS_ROTATION_WIDTH, -1);
-    gtk_entry_set_width_chars (GTK_ENTRY (dtw->rotation_status), 6);
+    gtk_entry_set_width_chars (GTK_ENTRY (dtw->rotation_status), 7);
     gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (dtw->rotation_status), FALSE);
+    gtk_spin_button_set_digits (GTK_SPIN_BUTTON (dtw->rotation_status), 2);
     gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (dtw->rotation_status), GTK_UPDATE_ALWAYS);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "input", G_CALLBACK (sp_dtw_rotation_input), dtw);
     g_signal_connect (G_OBJECT (dtw->rotation_status), "output", G_CALLBACK (sp_dtw_rotation_output), dtw);
@@ -1784,20 +1785,19 @@ sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw)
 {
     SPNamedView *nv = dtw->desktop->namedview;
     double value = gtk_spin_button_get_value (spin);
-//    if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
-//        nv->document_rotation = value;
-//        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
-//        SPObject *updated = SP_OBJECT(nv);
-//        if (updated) {
-//            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-//        }
-//        //dtw->desktop->canvas->endRotateTo();
-//    } else if( value != nv->document_rotation ) {
-        dtw->desktop->canvas->startRotateTo(0);
-        dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
-        if (value == 180) { dtw->desktop->canvas->endRotateTo();}
-//   }
-   spinbutton_defocus (GTK_WIDGET(spin));
+    if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
+        nv->document_rotation = value;
+        sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
+        SPObject *updated = SP_OBJECT(nv);
+        if (updated) {
+            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+        }
+        //dtw->desktop->canvas->endRotateTo();
+    }// else if( value != nv->document_rotation ) {
+        //dtw->desktop->canvas->startRotateTo(value);
+       // dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
+    // }
+    spinbutton_defocus (GTK_WIDGET(spin));
 }
 
 
@@ -1898,7 +1898,7 @@ sp_dtw_rotation_output (GtkSpinButton *spin, gpointer /*data*/)
 {
     gchar b[64];
     double val = gtk_spin_button_get_value (spin);
-    g_snprintf (b, 64, "%3.0fº", val);
+    g_snprintf (b, 64, "%3.2fº", val);
     gtk_entry_set_text (GTK_ENTRY (spin), b);
     return TRUE;
 }
-- 
cgit v1.2.3


From 74edf9fcbc3106cccddb2a293275748fefa08f0b Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 23 Oct 2016 20:04:23 +0200
Subject: Add right click rotation panning

(bzr r15142.1.22)
---
 src/display/sp-canvas.cpp  | 19 +++++++++++--------
 src/display/sp-canvas.h    |  2 +-
 src/ui/tools/tool-base.cpp | 11 +++++------
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 2f6caadd3..115b8c613 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -2077,31 +2077,33 @@ void SPCanvas::startRotateTo(double angle)
     cairo_paint(cr);
     cairo_destroy(cr);
     surface_origin  = new_backing_store_grey;
-    clearRotateTo(true);
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    dirtyAll();
+    addIdle();
 }
 
 bool SPCanvas::endRotateTo()
 {
-    if (!started) {
+    if (!_backing_store || !started) {
         return false; 
     }
     started = false;
     surface_rotated = NULL;
     surface_origin  = NULL;
-    clearRotateTo(true);
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    dirtyAll();
+    addIdle();
     return true;
 }
 
-void SPCanvas::clearRotateTo(bool clear)
+void SPCanvas::clearRotateTo()
 {
     if (!started) {
         return; 
     }
     gtk_widget_queue_draw(GTK_WIDGET(this));
     dirtyAll();
-    if (clear) {
-        addIdle();
-    }
+    addIdle();
 }
 
 void SPCanvas::rotateTo(SPCanvasItem * item, double angle, bool widget)
@@ -2217,7 +2219,8 @@ void SPCanvas::rotateTo(SPCanvasItem * item, double angle, bool widget)
     cairo_surface_destroy(_backing_store);
     _backing_store = new_backing_store;
     cairo_pattern_destroy (source_pattern);
-    clearRotateTo(false);
+    gtk_widget_queue_draw(GTK_WIDGET(this));
+    addIdle();
 }
 
 void SPCanvas::updateNow()
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 122cc2d8c..628bc74ca 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -75,7 +75,7 @@ struct SPCanvas {
     void startRotateTo(double angle);
     void rotateTo(SPCanvasItem * item, double angle, bool widget = false);
     bool endRotateTo();
-    void clearRotateTo(bool clear);
+    void clearRotateTo();
     /// Synchronously updates the canvas if necessary.
     void updateNow();
 
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 87f808039..33c0492d7 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -334,7 +334,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
     /// @todo REmove redundant /value in preference keys
     tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
     bool allow_panning = prefs->getBool("/options/spacebarpans/value");
-    bool clear = true;
     gint ret = FALSE;
 
     switch (event->type) {
@@ -346,7 +345,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
             } else {
                 /* sp_desktop_dialog(); */
             }
-            desktop->canvas->clearRotateTo();
             break;
 
         case GDK_BUTTON_PRESS:
@@ -434,14 +432,13 @@ bool ToolBase::root_handler(GdkEvent* event) {
                                     | GDK_POINTER_MOTION_HINT_MASK, NULL,
                             event->motion.time - 1);
                 } else if (this->space_panning && event->motion.state & GDK_BUTTON3_MASK) {
-                    clear = false;
                     sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     button_w = Geom::Point(event->motion.x, event->motion.y);
-                    Geom::Point const motion_dt(desktop->w2d(button_w));
+                    Geom::Point const motion_dt(desktop->doc2dt(desktop->w2d(button_w)));
                     Geom::Rect view = desktop->get_display_area();
                     Geom::Point view_center = desktop->doc2dt(view.midpoint());
-                    Geom::Ray center_ray(view_center, motion_dt);
+                    Geom::Ray center_ray(motion_dt, view_center);
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     angle = Geom::deg_from_rad(center_ray.angle()) - 90;
                     if (event->motion.state & GDK_SHIFT_MASK && event->motion.state & GDK_CONTROL_MASK) {
@@ -583,6 +580,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     ret = TRUE;
                 }
             }
+            desktop->canvas->clearRotateTo();
             break;
 
         case GDK_KEY_PRESS: {
@@ -752,6 +750,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
             switch (get_group0_keyval(&event->key)) {
             case GDK_KEY_space:
+                desktop->canvas->clearRotateTo();
                 if (within_tolerance) {
                     // Space was pressed, but not panned
                     sp_toggle_selector(desktop);
@@ -773,6 +772,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
             default:
                 break;
             }
+            desktop->canvas->clearRotateTo();
             break;
 
         case GDK_SCROLL: {
@@ -856,7 +856,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
         default:
             break;
     }
-    desktop->canvas->clearRotateTo(clear);
     return ret;
 }
 
-- 
cgit v1.2.3


From b65d3fdc9c15af81c5e433d8f1b714ef4ab61487 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 23 Oct 2016 21:18:11 +0200
Subject: Add right click rotation panning, some fixes

(bzr r15142.1.23)
---
 src/display/sp-canvas.cpp      | 113 ++++++++++++++++++++++-------------------
 src/display/sp-canvas.h        |   2 +-
 src/ui/tools/tool-base.cpp     |  15 +++++-
 src/widgets/desktop-widget.cpp |  12 +++--
 4 files changed, 82 insertions(+), 60 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 115b8c613..242a30248 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -2101,12 +2101,21 @@ void SPCanvas::clearRotateTo()
     if (!started) {
         return; 
     }
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(&_widget, &allocation);
+    cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
+    cairo_t *cr = cairo_create(new_backing_store);
+    cairo_set_source(cr, _background);
+    cairo_paint(cr);
+    cairo_destroy(cr);
+    cairo_surface_destroy(_backing_store);
+    _backing_store = new_backing_store;
     gtk_widget_queue_draw(GTK_WIDGET(this));
     dirtyAll();
     addIdle();
 }
 
-void SPCanvas::rotateTo(SPCanvasItem * item, double angle, bool widget)
+void SPCanvas::rotateTo(SPCanvasItem * item, double angle)
 {
     if (!_backing_store || !started) {
         return; 
@@ -2163,58 +2172,56 @@ void SPCanvas::rotateTo(SPCanvasItem * item, double angle, bool widget)
     cairo_fill(cr);
     cairo_translate(cr, half_w, half_h);
     cairo_rotate(cr, -angle*(M_PI/180.));
-    if (!widget) {
-        cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-        cairo_set_font_size(cr, 15.0);
-        cairo_text_extents_t extents;
-        std::ostringstream s;
-        s << _("Original angle ") << std::fixed << std::setprecision(2) << start_angle << "º";
-        cairo_text_extents(cr, s.str().c_str(), &extents);
-        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 25);
-        cairo_set_source_rgba (cr, 1, 1, 1, 1);
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 25) *-1);
-        s.str("");
-        s << _("New angle ") << std::fixed << std::setprecision(2) << angle << "º";
-        cairo_text_extents(cr, s.str().c_str(), &extents);
-        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 45);
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 45) *-1);
-        s.str("");
-        s << _("Gap ") << std::fixed << std::setprecision(2) << std::abs(start_angle-angle) << "º";
-        cairo_text_extents(cr, s.str().c_str(), &extents);
-        cairo_translate(cr, half_w - extents.width -15 ,-half_h + 65);
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 65) *-1);
-        cairo_translate(cr, -half_w + 10 ,-half_h + 25);
-        s.str("");
-        cairo_set_font_size(cr, 12.0);
-        s << _("Normal mode, 1º round step");
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (-half_w +10) * -1 ,(-half_h + 25) * -1);
-        cairo_translate(cr, -half_w + 10 ,-half_h + 40);
-        s.str("");
-        s << _("+CTRL, Fractional degrees");
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 40) * -1);
-        cairo_translate(cr, -half_w + 10 ,-half_h + 55);
-        s.str("");
-        s << _("+SHIFT, 5º round step");
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 55) * -1);
-        cairo_translate(cr, -half_w + 10 ,-half_h + 70);
-        s.str("");
-        s << _("+CTRL+SHIFT, Reset");
-        cairo_text_path(cr, s.str().c_str());
-        cairo_fill(cr);
-        //cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 60) * -1);
-    }
+    cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+    cairo_set_font_size(cr, 15.0);
+    cairo_text_extents_t extents;
+    std::ostringstream s;
+    s << _("Original angle ") << std::fixed << std::setprecision(2) << start_angle << "º";
+    cairo_text_extents(cr, s.str().c_str(), &extents);
+    cairo_translate(cr, half_w - extents.width -15 ,-half_h + 25);
+    cairo_set_source_rgba (cr, 1, 1, 1, 1);
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 25) *-1);
+    s.str("");
+    s << _("New angle ") << std::fixed << std::setprecision(2) << angle << "º";
+    cairo_text_extents(cr, s.str().c_str(), &extents);
+    cairo_translate(cr, half_w - extents.width -15 ,-half_h + 45);
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 45) *-1);
+    s.str("");
+    s << _("Gap ") << std::fixed << std::setprecision(2) << std::abs(start_angle-angle) << "º";
+    cairo_text_extents(cr, s.str().c_str(), &extents);
+    cairo_translate(cr, half_w - extents.width -15 ,-half_h + 65);
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (half_w - extents.width -15) *-1 ,(-half_h + 65) *-1);
+    cairo_translate(cr, -half_w + 10 ,-half_h + 25);
+    s.str("");
+    cairo_set_font_size(cr, 12.0);
+    s << _("Normal mode, 1º round step");
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (-half_w +10) * -1 ,(-half_h + 25) * -1);
+    cairo_translate(cr, -half_w + 10 ,-half_h + 40);
+    s.str("");
+    s << _("+CTRL, Fractional degrees");
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 40) * -1);
+    cairo_translate(cr, -half_w + 10 ,-half_h + 55);
+    s.str("");
+    s << _("+SHIFT, 5º round step");
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 55) * -1);
+    cairo_translate(cr, -half_w + 10 ,-half_h + 70);
+    s.str("");
+    s << _("+CTRL+SHIFT, Reset");
+    cairo_text_path(cr, s.str().c_str());
+    cairo_fill(cr);
+    //cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 60) * -1);
     cairo_destroy(cr);
     cairo_surface_destroy(_backing_store);
     _backing_store = new_backing_store;
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 628bc74ca..53b852140 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -73,7 +73,7 @@ struct SPCanvas {
     /// Scrolls canvas to specific position (cx and cy are measured in screen pixels).
     void scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling = false);
     void startRotateTo(double angle);
-    void rotateTo(SPCanvasItem * item, double angle, bool widget = false);
+    void rotateTo(SPCanvasItem * item, double angle);
     bool endRotateTo();
     void clearRotateTo();
     /// Synchronously updates the canvas if necessary.
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 33c0492d7..f7315c648 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -516,7 +516,21 @@ bool ToolBase::root_handler(GdkEvent* event) {
             break;
 
         case GDK_BUTTON_RELEASE:
+            desktop->canvas->clearRotateTo();
             if (this->space_panning && event->button.button == 3) {
+                xp = yp = 0;
+                if (panning_cursor == 1) {
+                    panning_cursor = 0;
+                    GtkWidget *w = GTK_WIDGET(this->desktop->getCanvas());
+                    gdk_window_set_cursor(gtk_widget_get_window (w), this->cursor);
+                }
+                zoom_rb = 0;
+                if (panning) {
+                    panning = 0;
+                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate),
+                            event->button.time);
+                }
+                ret = TRUE;
                 if (desktop->canvas->endRotateTo()) {
                     sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle);
                     SPObject *updated = SP_OBJECT(desktop->namedview);
@@ -580,7 +594,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     ret = TRUE;
                 }
             }
-            desktop->canvas->clearRotateTo();
             break;
 
         case GDK_KEY_PRESS: {
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index bc08c4f58..477414342 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1792,11 +1792,13 @@ sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw)
         if (updated) {
             updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
         }
-        //dtw->desktop->canvas->endRotateTo();
-    }// else if( value != nv->document_rotation ) {
-        //dtw->desktop->canvas->startRotateTo(value);
-       // dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
-    // }
+        dtw->desktop->canvas->endRotateTo();
+    }
+//    } else if( value != nv->document_rotation ) {
+//        dtw->desktop->canvas->clearRotateTo();
+//        dtw->desktop->canvas->startRotateTo(value);
+//        dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
+//    }
     spinbutton_defocus (GTK_WIDGET(spin));
 }
 
-- 
cgit v1.2.3


From fdb897947621a286ae05cd990e8663bb6c3dd907 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 23 Oct 2016 22:24:00 +0200
Subject: Fix for widget value of rotate

(bzr r15142.1.24)
---
 src/widgets/desktop-widget.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 477414342..94abd23a9 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -66,6 +66,7 @@
 #include <gtkmm/cssprovider.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/messagedialog.h>
+#include <iomanip>
 
 #if defined (SOLARIS) && (SOLARIS == 8)
 #include "round.h"
@@ -1890,7 +1891,11 @@ sp_dtw_rotation_input (GtkSpinButton *spin, gdouble *new_val, gpointer /*data*/)
     const gchar *b = gtk_entry_get_text (GTK_ENTRY (spin));
     gdouble new_typed = atof (b);
 
-    *new_val = new_typed;
+    if (new_scrolled == new_typed) { // the new value is set by scrolling
+        *new_val = new_scrolled;
+    } else { // the new value is typed in
+        *new_val = new_typed;
+    }
 
     return TRUE;
 }
@@ -1900,8 +1905,10 @@ sp_dtw_rotation_output (GtkSpinButton *spin, gpointer /*data*/)
 {
     gchar b[64];
     double val = gtk_spin_button_get_value (spin);
-    g_snprintf (b, 64, "%3.2fº", val);
-    gtk_entry_set_text (GTK_ENTRY (spin), b);
+    std::ostringstream s;
+    s.imbue(std::locale(""));;
+    s << std::fixed << std::setprecision(2) << val << "º";
+    gtk_entry_set_text (GTK_ENTRY (spin), s.str().c_str());
     return TRUE;
 }
 
-- 
cgit v1.2.3


From 043578ee79ae7dccc1967a9e380d276c9f73ed46 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 25 Oct 2016 23:30:06 +0200
Subject: Some bug fixes and improvements

(bzr r15142.1.25)
---
 src/display/sp-canvas.cpp      | 12 ------------
 src/ui/tools/tool-base.cpp     |  4 ----
 src/widgets/desktop-widget.cpp | 11 -----------
 3 files changed, 27 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index 242a30248..c4d454cb9 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -2077,9 +2077,6 @@ void SPCanvas::startRotateTo(double angle)
     cairo_paint(cr);
     cairo_destroy(cr);
     surface_origin  = new_backing_store_grey;
-    gtk_widget_queue_draw(GTK_WIDGET(this));
-    dirtyAll();
-    addIdle();
 }
 
 bool SPCanvas::endRotateTo()
@@ -2101,15 +2098,6 @@ void SPCanvas::clearRotateTo()
     if (!started) {
         return; 
     }
-    GtkAllocation allocation;
-    gtk_widget_get_allocation(&_widget, &allocation);
-    cairo_surface_t *new_backing_store = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, allocation.width, allocation.height);
-    cairo_t *cr = cairo_create(new_backing_store);
-    cairo_set_source(cr, _background);
-    cairo_paint(cr);
-    cairo_destroy(cr);
-    cairo_surface_destroy(_backing_store);
-    _backing_store = new_backing_store;
     gtk_widget_queue_draw(GTK_WIDGET(this));
     dirtyAll();
     addIdle();
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index f7315c648..8d1034161 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -533,10 +533,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 ret = TRUE;
                 if (desktop->canvas->endRotateTo()) {
                     sp_repr_set_svg_double(desktop->namedview->getRepr(), "inkscape:document-rotation", angle);
-                    SPObject *updated = SP_OBJECT(desktop->namedview);
-                    if (updated) {
-                        updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-                    }
                 }
             } else {
                 xp = yp = 0;
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 94abd23a9..4f5724ac2 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1787,19 +1787,8 @@ sp_desktop_widget_rotate_document(GtkSpinButton *spin, SPDesktopWidget *dtw)
     SPNamedView *nv = dtw->desktop->namedview;
     double value = gtk_spin_button_get_value (spin);
     if (!dtw->desktop->getDocument()->getRoot()->rotated && value != nv->document_rotation) {
-        nv->document_rotation = value;
         sp_repr_set_svg_double(nv->getRepr(), "inkscape:document-rotation", value);
-        SPObject *updated = SP_OBJECT(nv);
-        if (updated) {
-            updated->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-        }
-        dtw->desktop->canvas->endRotateTo();
     }
-//    } else if( value != nv->document_rotation ) {
-//        dtw->desktop->canvas->clearRotateTo();
-//        dtw->desktop->canvas->startRotateTo(value);
-//        dtw->desktop->canvas->rotateTo(dtw->desktop->getDrawing(),value);
-//    }
     spinbutton_defocus (GTK_WIDGET(spin));
 }
 
-- 
cgit v1.2.3


From b539e66398261e60f2b9218ff72058e962fe832d Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Wed, 26 Oct 2016 12:31:09 +0200
Subject: Add fadding from temporary rotate draw to real ones

(bzr r15142.1.27)
---
 src/display/sp-canvas.cpp | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index c4d454cb9..f168cffe6 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -1891,6 +1891,19 @@ SPCanvasGroup *SPCanvas::getRoot()
     return SP_CANVAS_GROUP(_root);
 }
 
+gdouble grayscale_value_matrix[20] = {
+   0.21, 0.72, 0.072, 0, 0,
+   0.21, 0.72, 0.072, 0, 0,
+   0.21, 0.72, 0.072, 0, 0,
+   0   , 0   , 0    , 1, 0
+   };
+cairo_surface_t *surface_rotated;
+cairo_surface_t *surface_origin;
+cairo_surface_t *surface_measure;
+double start_angle = 0;
+bool started = false;
+bool rotated = false;
+
 void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scrolling)
 {
     GtkAllocation allocation;
@@ -1913,9 +1926,14 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
     // Paint the background
     cairo_translate(cr, -ix, -iy);
+    if (rotated) {
+        cairo_translate(cr, dx, dy);    
+        rotated = false;
+    }
     cairo_set_source(cr, _background);
     cairo_paint(cr);
     // Copy the old backing store contents
+    
     cairo_set_source_surface(cr, _backing_store, _x0, _y0);
     cairo_rectangle(cr, _x0, _y0, allocation.width, allocation.height);
     cairo_clip(cr);
@@ -1951,17 +1969,7 @@ void SPCanvas::scrollTo(double cx, double cy, unsigned int clear, bool is_scroll
     }
     addIdle();
 }
-gdouble grayscale_value_matrix[20] = {
-   0.21, 0.72, 0.072, 0, 0,
-   0.21, 0.72, 0.072, 0, 0,
-   0.21, 0.72, 0.072, 0, 0,
-   0   , 0   , 0    , 1, 0
-   };
-cairo_surface_t *surface_rotated;
-cairo_surface_t *surface_origin;
-cairo_surface_t *surface_measure;
-double start_angle = 0;
-bool started = false;
+
 void SPCanvas::startRotateTo(double angle)
 {
     if (!_backing_store || started) {
@@ -2090,6 +2098,7 @@ bool SPCanvas::endRotateTo()
     gtk_widget_queue_draw(GTK_WIDGET(this));
     dirtyAll();
     addIdle();
+    rotated = true;
     return true;
 }
 
-- 
cgit v1.2.3


From 126cabd5f87ca04262879584dd4ec1ac923edacd Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Tue, 1 Nov 2016 18:01:07 +0100
Subject: Fix angle constrain, thanks to vlada, Mc and LiamW

(bzr r15142.1.29)
---
 src/display/sp-canvas.cpp  | 2 +-
 src/ui/tools/tool-base.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index e84303816..427cec20a 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -2211,7 +2211,7 @@ void SPCanvas::rotateTo(double angle)
     cairo_translate(cr, -half_w + 10 ,-half_h + 55);
     s.str("");
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    s << _("+CTRL, ") << prefs->getInt("/options/rotationsnapsperpi/value", 15) << _("º round step");
+    s << _("+CTRL, ") << 180.0/prefs->getInt("/options/rotationsnapsperpi/value", 12) << _("º round step");
     cairo_text_path(cr, s.str().c_str());
     cairo_fill(cr);
     cairo_translate(cr, (-half_w + 10) * -1 ,(-half_h + 55) * -1);
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index e1b2f97af..999e2d0b2 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -335,7 +335,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
     /// @todo REmove redundant /value in preference keys
     tolerance = prefs->getIntLimited("/options/dragtolerance/value", 0, 0, 100);
     bool allow_panning = prefs->getBool("/options/spacebarpans/value");
-    int rotation_snap = prefs->getInt("/options/rotationsnapsperpi/value", 15);
+    int rotation_snap = 180.0/prefs->getInt("/options/rotationsnapsperpi/value", 12);
     gint ret = FALSE;
 
     switch (event->type) {
-- 
cgit v1.2.3


From bf313d184ec2c93b4605b7c88ed9fcf341510d35 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 5 Nov 2016 18:52:21 +0100
Subject: Change modifier to enter rotate mode from SHIFT to CONTROL

(bzr r15142.1.31)
---
 src/ui/tools/tool-base.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 999e2d0b2..6acbe9f9f 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -376,7 +376,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 break;
 
             case 2:
-                if (event->button.state & GDK_MOD1_MASK) {
+                if (event->button.state & GDK_CONTROL_MASK) {
                     sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     this->rotating_mode = true;
@@ -406,7 +406,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 break;
 
             case 3:
-                if (event->button.state & GDK_MOD1_MASK) {
+                if (event->button.state & GDK_CONTROL_MASK) {
                     sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     this->rotating_mode = true;
@@ -742,7 +742,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 break;
 
             case GDK_KEY_space:
-                if (event->key.state & GDK_MOD1_MASK) {
+                if (event->key.state & GDK_CONTROL_MASK) {
                     sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     this->rotating_mode = true;
-- 
cgit v1.2.3


From 647b3ccad1fd3b178e92341fdc92fd276a234dff Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sat, 5 Nov 2016 22:29:03 +0100
Subject: Add exporters

(bzr r15142.1.32)
---
 src/extension/internal/cairo-png-out.cpp          |  4 ++--
 src/extension/internal/cairo-ps-out.cpp           |  7 +++++--
 src/extension/internal/cairo-renderer-pdf-out.cpp |  4 +++-
 src/extension/internal/emf-inout.cpp              |  5 +++--
 src/extension/internal/javafx-out.cpp             |  9 +++++++--
 src/extension/internal/latex-pstricks-out.cpp     |  2 ++
 src/extension/internal/odf.cpp                    |  9 ++++++++-
 src/extension/internal/pov-out.cpp                | 13 ++++++++++---
 src/extension/internal/wmf-inout.cpp              |  7 +++++--
 src/print.cpp                                     |  2 ++
 src/ui/dialog/export.cpp                          |  3 ---
 11 files changed, 47 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/extension/internal/cairo-png-out.cpp b/src/extension/internal/cairo-png-out.cpp
index 956fcce9a..5859a82da 100644
--- a/src/extension/internal/cairo-png-out.cpp
+++ b/src/extension/internal/cairo-png-out.cpp
@@ -53,11 +53,10 @@ png_render_document_to_file(SPDocument *doc, gchar const *filename)
 {
     CairoRenderer *renderer;
     CairoRenderContext *ctx;
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
 /* Start */
-
     SPItem *base = doc->getRoot();
     Inkscape::Drawing drawing;
     unsigned dkey = SPItem::display_key_new(1);
@@ -77,6 +76,7 @@ png_render_document_to_file(SPDocument *doc, gchar const *filename)
     renderer->destroyContext(ctx);
 
     base->invoke_hide(dkey);
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 /* end */
     delete renderer;
 
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index e8f47e79e..809125266 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -68,6 +68,7 @@ static bool
 ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int level, bool texttopath, bool omittext,
                           bool filtertobitmap, int resolution, const gchar * const exportId, bool exportDrawing, bool exportCanvas, float bleedmargin_px, bool eps = false)
 {
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
     SPItem *base = NULL;
@@ -84,9 +85,10 @@ ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int l
         pageBoundingBox = !exportDrawing;
     }
 
-    if (!base)
+    if (!base) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return false;
-
+    }
     Inkscape::Drawing drawing;
     unsigned dkey = SPItem::display_key_new(1);
     base->invoke_show(drawing, dkey, SP_ITEM_SHOW_DISPLAY);
@@ -115,6 +117,7 @@ ps_print_document_to_file(SPDocument *doc, gchar const *filename, unsigned int l
 
     renderer->destroyContext(ctx);
     delete renderer;
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 
     return ret;
 }
diff --git a/src/extension/internal/cairo-renderer-pdf-out.cpp b/src/extension/internal/cairo-renderer-pdf-out.cpp
index 5576676b2..5558fe1ad 100644
--- a/src/extension/internal/cairo-renderer-pdf-out.cpp
+++ b/src/extension/internal/cairo-renderer-pdf-out.cpp
@@ -61,6 +61,7 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
                             bool texttopath, bool omittext, bool filtertobitmap, int resolution,
                             const gchar * const exportId, bool exportDrawing, bool exportCanvas, float bleedmargin_px)
 {
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
 /* Start */
@@ -80,6 +81,7 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
     }
 
     if (!base) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return false;
     }
     
@@ -112,7 +114,7 @@ pdf_render_document_to_file(SPDocument *doc, gchar const *filename, unsigned int
 
     renderer->destroyContext(ctx);
     delete renderer;
-
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
     return ret;
 }
 
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 12751c5ec..198c18ff2 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -94,7 +94,7 @@ Emf::print_document_to_file(SPDocument *doc, const gchar *filename)
     const gchar *oldconst;
     gchar *oldoutput;
     unsigned int ret;
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
     mod = Inkscape::Extension::get_print(PRINT_EMF);
@@ -114,6 +114,7 @@ Emf::print_document_to_file(SPDocument *doc, const gchar *filename)
     /* Print document */
     ret = mod->begin(doc);
     if (ret) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         g_free(oldoutput);
         throw Inkscape::Extension::Output::save_failed();
     }
@@ -127,7 +128,7 @@ Emf::print_document_to_file(SPDocument *doc, const gchar *filename)
 
     mod->set_param_string("destination", oldoutput);
     g_free(oldoutput);
-
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
     return;
 }
 
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d7ad7e6f7..c95434939 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -843,7 +843,8 @@ void JavaFXOutput::reset()
 bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 {
     reset();
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    doc->ensureUpToDate();
 
     name = Glib::path_get_basename(filename_utf8);
     int pos = name.find('.');
@@ -856,12 +857,14 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
     //# Lets do the curves first, to get the stats
 
     if (!doTree(doc)) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return false;
     }
     String curveBuf = outbuf;
     outbuf.clear();
 
     if (!doHeader()) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return false;
     }
 
@@ -875,6 +878,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
     doBody(doc, doc->getRoot());
 
     if (!doTail()) {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return false;
     }
 
@@ -884,6 +888,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
     FILE *f = Inkscape::IO::fopen_utf8name(filename_utf8, "w");
     if (!f)
         {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         err("Could open JavaFX file '%s' for writing", filename_utf8);
         return false;
         }
@@ -894,7 +899,7 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
         }
 
     fclose(f);
-
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
     return true;
 }
 
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 3ce2c5531..aa6ea6963 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -49,6 +49,7 @@ bool LatexOutput::check(Inkscape::Extension::Extension * /*module*/)
 void LatexOutput::save(Inkscape::Extension::Output * /*mod2*/, SPDocument *doc, gchar const *filename)
 {
     SPPrintContext context;
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
     Inkscape::Extension::Print *mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_LATEX);
@@ -76,6 +77,7 @@ void LatexOutput::save(Inkscape::Extension::Output * /*mod2*/, SPDocument *doc,
 
     mod->set_param_string("destination", oldoutput);
     g_free(oldoutput);
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 }
 
 #include "clear-n_.h"
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index f885ef5e5..66d370357 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -72,6 +72,7 @@
 #include "sp-path.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
+#include "sp-root.h"
 #include "svg/svg.h"
 #include "text-editing.h"
 #include "util/units.h"
@@ -2095,7 +2096,8 @@ void OdfOutput::reset()
 void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *filename)
 {
     reset();
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    doc->ensureUpToDate();
     documentUri = Inkscape::URI(filename);
 
     ZipFile zf;
@@ -2104,25 +2106,30 @@ void OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gcha
     if (!writeManifest(zf))
         {
         g_warning("Failed to write manifest");
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return;
         }
 
     if (!writeContent(zf, doc->rroot))
         {
         g_warning("Failed to write content");
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return;
         }
 
     if (!writeMeta(zf))
         {
         g_warning("Failed to write metafile");
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return;
         }
 
     if (!zf.writeFile(filename))
         {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return;
         }
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 }
 
 
diff --git a/src/extension/internal/pov-out.cpp b/src/extension/internal/pov-out.cpp
index 8df883069..03a2ecd62 100644
--- a/src/extension/internal/pov-out.cpp
+++ b/src/extension/internal/pov-out.cpp
@@ -616,11 +616,13 @@ void PovOutput::reset()
 void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 {
     reset();
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    doc->ensureUpToDate();
     //###### SAVE IN POV FORMAT TO BUFFER
     //# Lets do the curves first, to get the stats
     if (!doTree(doc))
         {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         err("Could not output curves for %s", filename_utf8);
         return;
         }
@@ -630,6 +632,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 
     if (!doHeader())
         {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         err("Could not write header for %s", filename_utf8);
         return;
         }
@@ -638,6 +641,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
 
     if (!doTail())
         {
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         err("Could not write footer for %s", filename_utf8);
         return;
         }
@@ -648,9 +652,11 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
     //###### WRITE TO FILE
     Inkscape::IO::dump_fopen_call(filename_utf8, "L");
     FILE *f = Inkscape::IO::fopen_utf8name(filename_utf8, "w");
-    if (!f)
+    if (!f){
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         return;
-
+    }
+    
     for (String::iterator iter = outbuf.begin() ; iter!=outbuf.end(); ++iter)
         {
         int ch = *iter;
@@ -658,6 +664,7 @@ void PovOutput::saveDocument(SPDocument *doc, gchar const *filename_utf8)
         }
 
     fclose(f);
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 }
 
 
diff --git a/src/extension/internal/wmf-inout.cpp b/src/extension/internal/wmf-inout.cpp
index c7226a58a..a79af5ec1 100644
--- a/src/extension/internal/wmf-inout.cpp
+++ b/src/extension/internal/wmf-inout.cpp
@@ -95,7 +95,7 @@ Wmf::print_document_to_file(SPDocument *doc, const gchar *filename)
     SPPrintContext context;
     const gchar *oldconst;
     gchar *oldoutput;
-
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
     mod = Inkscape::Extension::get_print(PRINT_WMF);
@@ -115,6 +115,7 @@ Wmf::print_document_to_file(SPDocument *doc, const gchar *filename)
     /* Print document */
     if (mod->begin(doc)) {
         g_free(oldoutput);
+        doc->getRoot()->c2p *= doc->getRoot()->rotation;
         throw Inkscape::Extension::Output::save_failed();
     }
     mod->base->invoke_print(&context);
@@ -127,7 +128,7 @@ Wmf::print_document_to_file(SPDocument *doc, const gchar *filename)
 
     mod->set_param_string("destination", oldoutput);
     g_free(oldoutput);
-
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
     return;
 }
 
@@ -135,6 +136,8 @@ Wmf::print_document_to_file(SPDocument *doc, const gchar *filename)
 void
 Wmf::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *filename)
 {
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
+    doc->ensureUpToDate();
     Inkscape::Extension::Extension * ext;
 
     ext = Inkscape::Extension::db.get(PRINT_WMF);
diff --git a/src/print.cpp b/src/print.cpp
index 7cd05ac93..479401995 100644
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -79,6 +79,7 @@ unsigned int sp_print_text(SPPrintContext *ctx, char const *text, Geom::Point p,
 void
 sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
 {
+    doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
     doc->ensureUpToDate();
 
     // Build arena
@@ -88,6 +89,7 @@ sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
     Inkscape::UI::Dialog::Print printop(doc,base);
     Gtk::PrintOperationResult res = printop.run(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG, parentWindow);
     (void)res; // TODO handle this
+    doc->getRoot()->c2p *= doc->getRoot()->rotation;
 }
 
 void sp_print_document_to_file(SPDocument *doc, gchar const *filename)
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 95c97390d..c38e798ec 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -977,9 +977,6 @@ void Export::onExport ()
     SPDocument *doc = desktop->getDocument();
     Geom::Affine rot = doc->getRoot()->c2p;
     doc->getRoot()->c2p = doc->getRoot()->rotation.inverse() * doc->getRoot()->c2p;
-    //double rotate_angle = doc->getRoot()->get_rotation();
-    //Inkscape::XML::Node *nv_repr = sp_item_group_get_child_by_name(doc->getRoot(), NULL, "sodipodi:namedview")->getRepr();
-    //sp_repr_set_svg_double(nv_repr, "inkscape:document-rotation", 0.);
     doc->ensureUpToDate();
     bool exportSuccessful = false;
 
-- 
cgit v1.2.3


From f18cdd20ca7d36fb3b67b4c4b1ae9b315791e02e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Sun, 6 Nov 2016 21:10:58 +0100
Subject: Fix a bug that allow to enter rotate mode with right click

(bzr r15142.1.33)
---
 src/ui/tools/tool-base.cpp | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 6acbe9f9f..fba9ae94f 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -406,34 +406,25 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 break;
 
             case 3:
-                if (event->button.state & GDK_CONTROL_MASK) {
-                    sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), event->button.time);
-                    desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
-                    this->rotating_mode = true;
-                    this->message_context->set(Inkscape::INFORMATION_MESSAGE,
-                            _("<b>Space+ALT+mouse move</b> to rotate canvas"));
-                } else {
-                    if ((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK)) {
-                        // When starting panning, make sure there are no snap events pending because these might disable the panning again
-                        if (_uses_snap) {
-                            sp_event_context_discard_delayed_snap_event(this);
-                        }
-                        panning = 3;
+                if ((event->button.state & GDK_SHIFT_MASK) || (event->button.state & GDK_CONTROL_MASK)) {
+                    // When starting panning, make sure there are no snap events pending because these might disable the panning again
+                    if (_uses_snap) {
+                        sp_event_context_discard_delayed_snap_event(this);
+                    }
+                    panning = 3;
 
-                        sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
-                                GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
-                                        | GDK_POINTER_MOTION_HINT_MASK, NULL,
-                                event->button.time);
+                    sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
+                            GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK
+                                    | GDK_POINTER_MOTION_HINT_MASK, NULL,
+                            event->button.time);
 
-                        ret = TRUE;
-                    } else if( !this->space_panning) {
-                        sp_event_root_menu_popup(desktop, NULL, event);
-                    }
-                    desktop->canvas->clearRotateTo();
-                    this->rotating_mode = false;
                     ret = TRUE;
-                    desktop->canvas->endRotateTo();
+                } else if( !this->space_panning) {
+                    sp_event_root_menu_popup(desktop, NULL, event);
                 }
+                desktop->canvas->clearRotateTo();
+                this->rotating_mode = false;
+                ret = TRUE;
                 break;
 
             default:
-- 
cgit v1.2.3


From 46d3c703414abe90dfbe79befbd0b4c80a86ea36 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 7 Nov 2016 19:33:24 +0100
Subject: Fix some bugs pointed by vlada

(bzr r15142.1.35)
---
 src/ui/tools/tool-base.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index fba9ae94f..c789b44bb 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -381,7 +381,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     this->rotating_mode = true;
                     this->message_context->set(Inkscape::INFORMATION_MESSAGE,
-                            _("<b>Space+ALT+mouse move</b> to rotate canvas"));
+                            _("<b>MMB + mouse move</b> to rotate canvas, use modifiers on screen to change snaps"));
                 } else {
                     if (event->button.state & GDK_SHIFT_MASK) {
                         zoom_rb = 2;
@@ -397,10 +397,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                                         | GDK_POINTER_MOTION_HINT_MASK, NULL,
                                 event->button.time - 1);
                     }
-                    desktop->canvas->clearRotateTo();
-                    this->rotating_mode = false;
                     ret = TRUE;
-                    desktop->canvas->endRotateTo();
                 }
                 ret = TRUE;
                 break;
@@ -422,8 +419,6 @@ bool ToolBase::root_handler(GdkEvent* event) {
                 } else if( !this->space_panning) {
                     sp_event_root_menu_popup(desktop, NULL, event);
                 }
-                desktop->canvas->clearRotateTo();
-                this->rotating_mode = false;
                 ret = TRUE;
                 break;
 
@@ -464,7 +459,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                                 | GDK_POINTER_MOTION_HINT_MASK, NULL,
                         event->motion.time - 1);
             }
-            if (panning) {
+            if (panning && !this->rotating_mode) {
                 if ((panning == 2 && !(event->motion.state & GDK_BUTTON2_MASK))
                         || (panning == 1 && !(event->motion.state & GDK_BUTTON1_MASK))
                         || (panning == 3 && !(event->motion.state & GDK_BUTTON3_MASK))) {
@@ -738,7 +733,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     desktop->canvas->startRotateTo(desktop->namedview->document_rotation);
                     this->rotating_mode = true;
                     this->message_context->set(Inkscape::INFORMATION_MESSAGE,
-                            _("<b>Space+ALT+mouse move</b> to rotate canvas"));
+                            _("<b>Space+mouse move</b> to rotate canvas, use modifiers on screen to change snaps"));
                 } else {
                     within_tolerance = true;
                     xp = yp = 0;
-- 
cgit v1.2.3


From 7f2d487d23d4b0e95ceb8d1cc4ad6ffb18a32f90 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 7 Nov 2016 19:53:29 +0100
Subject: Fix some bugs

(bzr r15142.1.37)
---
 src/ui/tools/tool-base.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c789b44bb..ca700f652 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -373,6 +373,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
                     ret = TRUE;
                 }
+                desktop->canvas->clearRotateTo();
+                this->rotating_mode = false;
                 break;
 
             case 2:
@@ -420,6 +422,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     sp_event_root_menu_popup(desktop, NULL, event);
                 }
                 ret = TRUE;
+                desktop->canvas->clearRotateTo();
+                this->rotating_mode = false;
                 break;
 
             default:
@@ -836,9 +840,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
             if (this->rotating_mode) {
                 desktop->canvas->clearRotateTo();
                 this->rotating_mode = false;
-                ret = TRUE;
                 desktop->canvas->endRotateTo();
-                break;
             }
             bool ctrl = (event->scroll.state & GDK_CONTROL_MASK);
             bool wheelzooms = prefs->getBool("/options/wheelzooms/value");
-- 
cgit v1.2.3