From 7b4ab83dcdf92b42c68f79b3761d3717cac9366d Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Sat, 29 Jul 2017 11:14:21 +0200 Subject: More icon clean up (transforms). --- share/icons/transform-move-horizontal.svg | 56 +++++++++-------------- share/icons/transform-move-vertical.svg | 55 ++++++++--------------- share/icons/transform-rotate.svg | 58 +++++++++--------------- share/icons/transform-scale-horizontal.svg | 71 +++++++++++++---------------- share/icons/transform-scale-vertical.svg | 72 +++++++++++++----------------- share/icons/transform-skew-horizontal.svg | 67 +++++++++++---------------- share/icons/transform-skew-vertical.svg | 67 +++++++++++---------------- 7 files changed, 173 insertions(+), 273 deletions(-) diff --git a/share/icons/transform-move-horizontal.svg b/share/icons/transform-move-horizontal.svg index 602cbec62..94cf23b00 100644 --- a/share/icons/transform-move-horizontal.svg +++ b/share/icons/transform-move-horizontal.svg @@ -1,50 +1,34 @@ - - - - - - - - - + + + + + - - - + + + + + + + - - - - - - - - - - + + + + + + + + - diff --git a/share/icons/transform-move-vertical.svg b/share/icons/transform-move-vertical.svg index 7c9ab3348..e3ecf3456 100644 --- a/share/icons/transform-move-vertical.svg +++ b/share/icons/transform-move-vertical.svg @@ -1,50 +1,33 @@ - - - - - - - - - + + + + + - - - + + + + + + + - - - - - - - - - - + + + + + + + - diff --git a/share/icons/transform-rotate.svg b/share/icons/transform-rotate.svg index a1b0be7b0..0d5a86fab 100644 --- a/share/icons/transform-rotate.svg +++ b/share/icons/transform-rotate.svg @@ -1,51 +1,35 @@ - - - - - - - - - - - + + + + + - + + + + + + + - - - - - - - - - - + + + + + + + + + - - diff --git a/share/icons/transform-scale-horizontal.svg b/share/icons/transform-scale-horizontal.svg index d2fb1b173..93fe96f15 100644 --- a/share/icons/transform-scale-horizontal.svg +++ b/share/icons/transform-scale-horizontal.svg @@ -1,53 +1,44 @@ - - - - - - - - - - - - - - - + + + + + + - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - - - diff --git a/share/icons/transform-scale-vertical.svg b/share/icons/transform-scale-vertical.svg index 6556439a2..c57d28f7a 100644 --- a/share/icons/transform-scale-vertical.svg +++ b/share/icons/transform-scale-vertical.svg @@ -1,53 +1,45 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + - - - diff --git a/share/icons/transform-skew-horizontal.svg b/share/icons/transform-skew-horizontal.svg index ca6c9852b..56c159c2c 100644 --- a/share/icons/transform-skew-horizontal.svg +++ b/share/icons/transform-skew-horizontal.svg @@ -1,54 +1,37 @@ - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - diff --git a/share/icons/transform-skew-vertical.svg b/share/icons/transform-skew-vertical.svg index 87cbbad25..03936171c 100644 --- a/share/icons/transform-skew-vertical.svg +++ b/share/icons/transform-skew-vertical.svg @@ -1,54 +1,37 @@ - - - - - - - - - - - - - - + + + + + + - - + + + + + + + + + - - - - - - - - - - - + + + + + + + + + - -- cgit v1.2.3 From 86fc9df3173d3abdd640c3fc0aa20d0237a89e0a Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 29 Jul 2017 17:30:50 +0200 Subject: cmake/MSYS2: Fix fontconfig's conf.d/ not being installed This resulted in font substitutions being broken (i.e. "Sans" was serif) --- CMakeScripts/InstallMSYS2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 5ad3b9d3e..d4d42ea37 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -163,7 +163,7 @@ if(WIN32) # fontconfig install(DIRECTORY ${MINGW_PATH}/etc/fonts DESTINATION etc - FILES_MATCHING PATTERN "fonts.conf" EXCLUDE) + PATTERN "fonts.conf" EXCLUDE) # adjust fonts.conf to store font cache in AppData set(cachedir_default "\\t^/var/cache/fontconfig^") # the '^' are needed to escape angle brackets on Windows command shell set(cachedir_appdata "\\t^LOCAL_APPDATA_FONTCONFIG_CACHE^") -- cgit v1.2.3 From 201523932d960706a6910e19ed7cc760d1463cb0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 29 Jul 2017 18:45:16 +0200 Subject: Fix a bug pointed by CR on delete nodes in fillet/chamfer LPE --- src/live_effects/lpe-fillet-chamfer.cpp | 6 +++--- src/live_effects/parameter/satellitesarray.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/live_effects/lpe-fillet-chamfer.cpp b/src/live_effects/lpe-fillet-chamfer.cpp index 11298bcbe..be5979f31 100644 --- a/src/live_effects/lpe-fillet-chamfer.cpp +++ b/src/live_effects/lpe-fillet-chamfer.cpp @@ -374,13 +374,13 @@ void LPEFilletChamfer::doBeforeEffect(SPLPEItem const *lpeItem) } for (size_t i = 0; i < satellites.size(); ++i) { for (size_t j = 0; j < satellites[i].size(); ++j) { + if (j >= pathv[i].size()) { + continue; + } Geom::Curve const &curve_in = pathv[i][j]; if (satellites[i][j].is_time != flexible) { satellites[i][j].is_time = flexible; double amount = satellites[i][j].amount; - if (pathv[i].size() == j) { - continue; - } if (satellites[i][j].is_time) { double time = timeAtArcLength(amount, curve_in); satellites[i][j].amount = time; diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp index ce4da243e..6b50f8c09 100644 --- a/src/live_effects/parameter/satellitesarray.cpp +++ b/src/live_effects/parameter/satellitesarray.cpp @@ -107,8 +107,9 @@ void SatellitesArrayParam::updateCanvasIndicators(bool mirror) if (_vector[i][j].hidden || //Ignore if hidden (!_vector[i][j].has_mirror && mirror == true) || //Ignore if not have mirror and we are in mirror loop _vector[i][j].amount == 0 || //no helper in 0 value - pathv[i].size() == j || //ignore last satellite in open paths with fillet chamfer effect - (!pathv[i].closed() && j == 0)) //ignore first satellites on open paths + j >= pathv[i].size() || //ignore last satellite in open paths with fillet chamfer effect + (!pathv[i].closed() && j == 0) || //ignore first satellites on open paths + pathv[i].size() == 2) { continue; } @@ -388,7 +389,7 @@ Geom::Point FilletChamferKnotHolderEntity::knot_get() const Geom::PathVector pathv = _pparam->_last_pathvector_satellites->getPathVector(); if (satellite.hidden || (!pathv[path_index].closed() && curve_index == 0) ||//ignore first satellites on open paths - pathv[path_index].size() == curve_index) //ignore last satellite in open paths with fillet chamfer effect + curve_index >= pathv[path_index].size()) { return Geom::Point(Geom::infinity(), Geom::infinity()); } -- cgit v1.2.3