summaryrefslogtreecommitdiffstats
path: root/src/desktop-style.cpp
diff options
context:
space:
mode:
authorvanntile <valentin.ionita1201@gmail.com>2019-08-11 09:15:19 +0000
committervanntile <valentin.ionita1201@gmail.com>2019-08-17 15:33:46 +0000
commit863a58d272adaa3c371874e3472e7b90b57dcfb5 (patch)
treecb098c455031b28a82ac2c1fbd2af30999f774a8 /src/desktop-style.cpp
parentSome useful hatch changes (diff)
downloadinkscape-863a58d272adaa3c371874e3472e7b90b57dcfb5.tar.gz
inkscape-863a58d272adaa3c371874e3472e7b90b57dcfb5.zip
Formatting last commit
Diffstat (limited to 'src/desktop-style.cpp')
-rw-r--r--src/desktop-style.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 072a38eec..dfcc0eead 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -26,6 +26,8 @@
#include "selection.h"
#include "object/box3d-side.h"
+#include "object/filters/blend.h"
+#include "object/filters/gaussian-blur.h"
#include "object/sp-flowdiv.h"
#include "object/sp-flowregion.h"
#include "object/sp-flowtext.h"
@@ -39,8 +41,6 @@
#include "object/sp-tspan.h"
#include "object/sp-use.h"
#include "style.h"
-#include "object/filters/blend.h"
-#include "object/filters/gaussian-blur.h"
#include "svg/css-ostringstream.h"
#include "svg/svg-color.h"
@@ -549,8 +549,9 @@ objects_query_fillstroke (const std::vector<SPItem*> &objects, SPStyle *style_re
SPLinearGradient *linear_res = dynamic_cast<SPLinearGradient *>(server_res);
SPRadialGradient *radial_res = linear_res ? nullptr : dynamic_cast<SPRadialGradient *>(server_res);
SPPattern *pattern_res = (linear_res || radial_res) ? nullptr : dynamic_cast<SPPattern *>(server_res);
- SPHatch *hatch_res = (linear_res || radial_res || pattern_res) ? nullptr : dynamic_cast<SPHatch *>(server_res);
-
+ SPHatch *hatch_res =
+ (linear_res || radial_res || pattern_res) ? nullptr : dynamic_cast<SPHatch *>(server_res);
+
if (linear_res) {
SPLinearGradient *linear = dynamic_cast<SPLinearGradient *>(server);
if (!linear) {
@@ -587,13 +588,13 @@ objects_query_fillstroke (const std::vector<SPItem*> &objects, SPStyle *style_re
} else if (hatch_res) {
SPHatch *hatch = dynamic_cast<SPHatch *>(server);
if (!hatch) {
- return QUERY_STYLE_MULTIPLE_DIFFERENT; // different kind of server
+ return QUERY_STYLE_MULTIPLE_DIFFERENT; // different kind of server
}
- SPHatch *hat = SP_HATCH (server)->rootHatch();
- SPHatch *hat_res = SP_HATCH (server_res)->rootHatch();
+ SPHatch *hat = SP_HATCH(server)->rootHatch();
+ SPHatch *hat_res = SP_HATCH(server_res)->rootHatch();
if (hat_res != hat) {
- return QUERY_STYLE_MULTIPLE_DIFFERENT; // different pattern roots
+ return QUERY_STYLE_MULTIPLE_DIFFERENT; // different hatch roots
}
}
}