From ef83ff75a0c6f83f63ee38e1617c097a887affe8 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 11 Dec 2018 19:58:13 -0500
Subject: use proper defaults for fill and stroke in Params (#362)

---
 lib/extensions/params.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lib/extensions/params.py')

diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 1f3032ca..386ce5dd 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -680,15 +680,16 @@ class Params(InkstitchExtension):
         element = EmbroideryElement(node)
         classes = []
 
-        if element.get_style("fill"):
-            classes.append(AutoFill)
-            classes.append(Fill)
+        if not is_command(node):
+            if element.get_style("fill", "black") != "none":
+                classes.append(AutoFill)
+                classes.append(Fill)
 
-        if element.get_style("stroke") and not is_command(node):
-            classes.append(Stroke)
+            if element.get_style("stroke") is not None:
+                classes.append(Stroke)
 
-            if element.get_style("stroke-dasharray") is None:
-                classes.append(SatinColumn)
+                if element.get_style("stroke-dasharray") is None:
+                    classes.append(SatinColumn)
 
         return classes
 
-- 
cgit v1.2.3


From e47fcaa8da14a4a40f151e90915f3d0d208ec7b8 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 11 Dec 2018 19:58:20 -0500
Subject: tidy up imports

---
 lib/extensions/params.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib/extensions/params.py')

diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 386ce5dd..6525cae2 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -1,23 +1,24 @@
 # -*- coding: UTF-8 -*-
 
+from collections import defaultdict
+from copy import copy
+from itertools import groupby
+import json
 import os
 import sys
-import json
-import traceback
 from threading import Thread, Event
-from copy import copy
+import traceback
+
 import wx
 from wx.lib.scrolledpanel import ScrolledPanel
-from collections import defaultdict
-from itertools import groupby
 
-from .base import InkstitchExtension
+from ..commands import is_command
+from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn
 from ..i18n import _
+from ..simulator import EmbroiderySimulator
 from ..stitch_plan import patches_to_stitch_plan
-from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn
 from ..utils import get_resource_dir
-from ..simulator import EmbroiderySimulator
-from ..commands import is_command
+from .base import InkstitchExtension
 
 
 def presets_path():
-- 
cgit v1.2.3


From dc77f5cebcdfa4e1fdeff9c8b231061f5b07de42 Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Tue, 18 Dec 2018 20:25:08 -0500
Subject: fix style

---
 lib/extensions/params.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'lib/extensions/params.py')

diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 8cd0debe..074a4288 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -3,7 +3,6 @@
 from collections import defaultdict
 from copy import copy
 from itertools import groupby
-import json
 import os
 import sys
 
@@ -13,7 +12,6 @@ from wx.lib.scrolledpanel import ScrolledPanel
 
 from ..commands import is_command
 from ..elements import EmbroideryElement, Fill, AutoFill, Stroke, SatinColumn
-from ..simulator import EmbroiderySimulator
 from ..gui import PresetsPanel, SimulatorPreview
 from ..i18n import _
 from ..utils import get_resource_dir
-- 
cgit v1.2.3


From 32458c619a38928f403e5924c8ba864fe7ae346c Mon Sep 17 00:00:00 2001
From: Lex Neva <github.com@lexneva.name>
Date: Wed, 19 Dec 2018 14:39:47 -0500
Subject: fix fill == none detection

---
 lib/extensions/params.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/extensions/params.py')

diff --git a/lib/extensions/params.py b/lib/extensions/params.py
index 074a4288..4d04ba23 100644
--- a/lib/extensions/params.py
+++ b/lib/extensions/params.py
@@ -462,7 +462,7 @@ class Params(InkstitchExtension):
         classes = []
 
         if not is_command(node):
-            if element.get_style("fill", "black") != "none":
+            if element.get_style("fill", "black") is not None:
                 classes.append(AutoFill)
                 classes.append(Fill)
 
-- 
cgit v1.2.3