From d12b9c9fa87c4fc4f7842e5d6512c4f17298cce7 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 3 Apr 2010 03:56:36 +0200 Subject: Initial fix for the inverted coordinate system bug (bzr r9281.1.1) --- src/ui/tool/control-point-selection.cpp | 4 ++-- src/ui/tool/path-manipulator.cpp | 2 +- src/ui/tool/transform-handle-set.cpp | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/ui') diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp index f880d2ddf..dfbf1170a 100644 --- a/src/ui/tool/control-point-selection.cpp +++ b/src/ui/tool/control-point-selection.cpp @@ -545,11 +545,11 @@ bool ControlPointSelection::event(GdkEvent *event) case GDK_Up: case GDK_KP_Up: case GDK_KP_8: - return _keyboardMove(event->key, Geom::Point(0, 1)); + return _keyboardMove(event->key, Geom::Point(0, -1)); case GDK_Down: case GDK_KP_Down: case GDK_KP_2: - return _keyboardMove(event->key, Geom::Point(0, -1)); + return _keyboardMove(event->key, Geom::Point(0, 1)); case GDK_Right: case GDK_KP_Right: case GDK_KP_6: diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp index 66f72f379..a50be873a 100644 --- a/src/ui/tool/path-manipulator.cpp +++ b/src/ui/tool/path-manipulator.cpp @@ -1193,7 +1193,7 @@ void PathManipulator::_updateOutline() Geom::Point at = j->pointAt(0.5); Geom::Point ut = j->unitTangentAt(0.5); // rotate the point - ut *= Geom::Rotate(150.0 / 180.0 * M_PI); + ut *= Geom::Rotate(210.0 / 180.0 * M_PI); Geom::Point arrow_end = _desktop->w2d( _desktop->d2w(at) + Geom::unit_vector(_desktop->d2w(ut)) * 10.0); diff --git a/src/ui/tool/transform-handle-set.cpp b/src/ui/tool/transform-handle-set.cpp index 1af848b96..4cbc5ed4d 100644 --- a/src/ui/tool/transform-handle-set.cpp +++ b/src/ui/tool/transform-handle-set.cpp @@ -34,17 +34,17 @@ namespace UI { namespace { Gtk::AnchorType corner_to_anchor(unsigned c) { switch (c % 4) { - case 0: return Gtk::ANCHOR_NE; - case 1: return Gtk::ANCHOR_NW; - case 2: return Gtk::ANCHOR_SW; - default: return Gtk::ANCHOR_SE; + case 0: return Gtk::ANCHOR_SE; + case 1: return Gtk::ANCHOR_SW; + case 2: return Gtk::ANCHOR_NW; + default: return Gtk::ANCHOR_NE; } } Gtk::AnchorType side_to_anchor(unsigned s) { switch (s % 4) { - case 0: return Gtk::ANCHOR_N; + case 0: return Gtk::ANCHOR_S; case 1: return Gtk::ANCHOR_W; - case 2: return Gtk::ANCHOR_S; + case 2: return Gtk::ANCHOR_N; default: return Gtk::ANCHOR_E; } } @@ -208,8 +208,8 @@ private: static Glib::RefPtr _corner_to_pixbuf(unsigned c) { sp_select_context_get_type(); switch (c % 2) { - case 0: return Glib::wrap(handles[1], true); - default: return Glib::wrap(handles[0], true); + case 0: return Glib::wrap(handles[0], true); + default: return Glib::wrap(handles[1], true); } } Geom::Point _sc_center; @@ -332,10 +332,10 @@ private: static Glib::RefPtr _corner_to_pixbuf(unsigned c) { sp_select_context_get_type(); switch (c % 4) { - case 0: return Glib::wrap(handles[10], true); - case 1: return Glib::wrap(handles[8], true); - case 2: return Glib::wrap(handles[6], true); - default: return Glib::wrap(handles[4], true); + case 0: return Glib::wrap(handles[4], true); + case 1: return Glib::wrap(handles[6], true); + case 2: return Glib::wrap(handles[8], true); + default: return Glib::wrap(handles[10], true); } } Geom::Point _rot_center; -- cgit v1.2.3 From 078d8b361e3b5c390a5f1b49986b7347f8003d67 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 3 Apr 2010 04:24:37 +0200 Subject: Fix rotation in node and select tool (bzr r9281.1.2) --- src/ui/tool/control-point-selection.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui') diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp index dfbf1170a..c7fc8a3cc 100644 --- a/src/ui/tool/control-point-selection.cpp +++ b/src/ui/tool/control-point-selection.cpp @@ -561,9 +561,9 @@ bool ControlPointSelection::event(GdkEvent *event) // rotates case GDK_bracketleft: - return _keyboardRotate(event->key, 1); - case GDK_bracketright: return _keyboardRotate(event->key, -1); + case GDK_bracketright: + return _keyboardRotate(event->key, 1); // scaling case GDK_less: -- cgit v1.2.3 From 726ae9f136c9cc3ee212af2594ab9991716e5389 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 3 Apr 2010 04:24:54 +0200 Subject: Fix align & distribute dialog (bzr r9281.1.3) --- src/ui/dialog/align-and-distribute.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/ui') diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index a75a8d68d..f27c49f61 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -252,11 +252,11 @@ ActionAlign::Coeffs const ActionAlign::_allCoeffs[10] = { {.5, .5, 0., 0., .5, .5, 0., 0.}, {0., 1., 0., 0., 0., 1., 0., 0.}, {0., 1., 0., 0., 1., 0., 0., 0.}, - {0., 0., 0., 1., 0., 0., 1., 0.}, - {0., 0., 0., 1., 0., 0., 0., 1.}, - {0., 0., .5, .5, 0., 0., .5, .5}, + {0., 0., 1., 0., 0., 0., 0., 1.}, {0., 0., 1., 0., 0., 0., 1., 0.}, - {0., 0., 1., 0., 0., 0., 0., 1.} + {0., 0., .5, .5, 0., 0., .5, .5}, + {0., 0., 0., 1., 0., 0., 0., 1.}, + {0., 0., 0., 1., 0., 0., 1., 0.} }; BBoxSort::BBoxSort(SPItem *pItem, Geom::Rect bounds, Geom::Dim2 orientation, double kBegin, double kEnd) : @@ -866,13 +866,13 @@ AlignAndDistribute::AlignAndDistribute() addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_TOP, _("Distribute top edges equidistantly"), - 1, 1, false, Geom::Y, 0, 1); + 1, 1, false, Geom::Y, 1., 0.); addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_CENTER, _("Distribute centers equidistantly vertically"), 1, 2, false, Geom::Y, .5, .5); addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BOTTOM, _("Distribute bottom edges equidistantly"), - 1, 3, false, Geom::Y, 1., 0.); + 1, 3, false, Geom::Y, 0., 1.); //Baseline distribs addBaselineButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_BASELINE, -- cgit v1.2.3 From 60e01e694ad379737b6ef436b8973e67871979b1 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sat, 3 Apr 2010 05:05:19 +0200 Subject: Fix single-handle keybindings (bzr r9281.1.4) --- src/ui/tool/multi-path-manipulator.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/ui') diff --git a/src/ui/tool/multi-path-manipulator.cpp b/src/ui/tool/multi-path-manipulator.cpp index 2025a12d7..392518207 100644 --- a/src/ui/tool/multi-path-manipulator.cpp +++ b/src/ui/tool/multi-path-manipulator.cpp @@ -470,12 +470,10 @@ bool MultiPathManipulator::event(GdkEvent *event) // single handle functions // rotation case GDK_bracketleft: - case GDK_braceleft: - pm.rotateHandle(n, which, 1, one_pixel); + pm.rotateHandle(n, which, -1, one_pixel); break; case GDK_bracketright: - case GDK_braceright: - pm.rotateHandle(n, which, -1, one_pixel); + pm.rotateHandle(n, which, 1, one_pixel); break; // adjust length case GDK_period: -- cgit v1.2.3