diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-25 21:30:06 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-25 21:30:06 +0000 |
| commit | 043578ee79ae7dccc1967a9e380d276c9f73ed46 (patch) | |
| tree | 74a065ea52503df07204addcb410e46182d88b58 /src | |
| parent | Fix for widget value of rotate (diff) | |
| download | inkscape-043578ee79ae7dccc1967a9e380d276c9f73ed46.tar.gz inkscape-043578ee79ae7dccc1967a9e380d276c9f73ed46.zip | |
Some bug fixes and improvements
(bzr r15142.1.25)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/sp-canvas.cpp | 12 | ||||
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/desktop-widget.cpp | 11 |
3 files changed, 0 insertions, 27 deletions
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)); } |
