From c14ec0bf6954beca505ed58b794632bd1ffe72ca Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 1 Oct 2016 02:00:59 +0300
Subject: Extract a function to prevent assignment + const-ing.

(bzr r15100.1.26)
---
 src/widgets/stroke-style.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/widgets/stroke-style.cpp')

diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 4a658c5dc..f5735190f 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -976,6 +976,16 @@ StrokeStyle::setScaledDash(SPCSSAttr *css,
     }
 }
 
+static inline double calcScaleLineWidth(const double width_typed, SPItem *const item, Inkscape::Util::Unit const *const unit)
+{
+    if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) {
+        return Inkscape::Util::Quantity::convert(width_typed, unit, "px");
+    } else { // percentage
+        const gdouble old_w = item->style->stroke_width.computed;
+        return old_w * width_typed / 100;
+    }
+}
+
 /**
  * Sets line properties like width, dashes, markers, etc. on all currently selected items.
  */
@@ -1007,13 +1017,7 @@ StrokeStyle::scaleLine()
 
         for(auto i=items.begin();i!=items.end();++i){
             /* Set stroke width */
-            double width;
-            if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) {
-                width = Inkscape::Util::Quantity::convert(width_typed, unit, "px");
-            } else { // percentage
-                gdouble old_w = (*i)->style->stroke_width.computed;
-                width = old_w * width_typed / 100;
-            }
+            const double width = calcScaleLineWidth(width_typed, (*i), unit);
 
             {
                 Inkscape::CSSOStringStream os_width;
-- 
cgit v1.2.3


From 13586717311b38bcddfa82602aa39c73e332dc87 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sat, 1 Oct 2016 17:27:14 +0300
Subject: Extract a method instead of assigning a temp bool var.

(bzr r15100.1.27)
---
 src/widgets/stroke-style.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/widgets/stroke-style.cpp')

diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index f5735190f..47131dec1 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -437,6 +437,12 @@ StrokeStyle::makeRadioButton(Gtk::RadioButtonGroup &grp,
     return tb;
 }
 
+bool StrokeStyle::shouldMarkersBeUpdated()
+{
+    return startMarkerCombo->update() || midMarkerCombo->update() ||
+                          endMarkerCombo->update();
+}
+
 /**
  * Handles when user selects one of the markers from the marker combobox.
  * Gets the marker uri string and applies it to all selected
@@ -444,11 +450,7 @@ StrokeStyle::makeRadioButton(Gtk::RadioButtonGroup &grp,
  */
 void StrokeStyle::markerSelectCB(MarkerComboBox *marker_combo, StrokeStyle *spw, SPMarkerLoc const /*which*/)
 {
-    bool markers_update = spw->startMarkerCombo->update() ||
-                          spw->midMarkerCombo->update() ||
-                          spw->endMarkerCombo->update();
-
-    if (spw->update || markers_update) {
+    if (spw->update || spw->shouldMarkersBeUpdated()) {
         return;
     }
 
-- 
cgit v1.2.3


From 086347db66cff034f3e1fdce59a89156c49b5b95 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Sun, 2 Oct 2016 15:26:27 +0300
Subject: Extract a function - is_query_style_updateable.

(bzr r15100.1.29)
---
 src/widgets/stroke-style.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/widgets/stroke-style.cpp')

diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 47131dec1..81a8e8115 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -22,6 +22,7 @@
 #include "svg/svg-color.h"
 #include "ui/widget/unit-menu.h"
 #include "desktop-widget.h"
+#include "widgets/style-utils.h"
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::unit_table;
@@ -912,22 +913,20 @@ StrokeStyle::updateLine()
     if (result_ml != QUERY_STYLE_NOTHING)
         (*miterLimitAdj)->set_value(query.stroke_miterlimit.value); // TODO: reflect averagedness?
 
-    if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT &&
-        result_join != QUERY_STYLE_NOTHING ) {
+    using Inkscape::is_query_style_updateable;
+    if (! is_query_style_updateable(result_join)) {
         setJoinType(query.stroke_linejoin.value);
     } else {
         setJoinButtons(NULL);
     }
 
-    if (result_cap != QUERY_STYLE_MULTIPLE_DIFFERENT &&
-        result_cap != QUERY_STYLE_NOTHING ) {
+    if (! is_query_style_updateable(result_cap)) {
         setCapType (query.stroke_linecap.value);
     } else {
         setCapButtons(NULL);
     }
 
-    if (result_order != QUERY_STYLE_MULTIPLE_DIFFERENT &&
-        result_order != QUERY_STYLE_NOTHING ) {
+    if (! is_query_style_updateable(result_order)) {
         setPaintOrder (query.paint_order.value);
     } else {
         setPaintOrder (NULL);
-- 
cgit v1.2.3