From c5bda708d1d5f0c1c0135790e91501b2725b52e8 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Tue, 14 Feb 2017 12:34:38 +0300 Subject: [PATCH] Added strict checking of casing necessity --- src/libkomwm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libkomwm.py b/src/libkomwm.py index 2bc0e4e..1ad44e4 100644 --- a/src/libkomwm.py +++ b/src/libkomwm.py @@ -330,7 +330,7 @@ def komap_mapswithme(options): st['z-index'] = float(st.get('z-index', 0)) - 15001. if st.get('casing-width') not in (None, 0): # and (st.get('width') or st.get('fill-color')): - if st.get('casing-linecap', 'butt') == 'butt': + if has_lines and st.get('casing-linecap', 'butt') == 'butt': dr_line = LineRuleProto() dr_line.width = (st.get('width', 0) * WIDTH_SCALE) + (st.get('casing-width') * WIDTH_SCALE * 2) dr_line.color = mwm_encode_color(colors, st, "casing") @@ -345,7 +345,7 @@ def komap_mapswithme(options): dr_line.join = dr_linejoins.get(st.get('casing-linejoin', 'round'), ROUNDJOIN) dr_element.lines.extend([dr_line]) - if ('fill-color' in st) and (float(st.get('fill-opacity', 1)) > 0): + if has_fills and 'fill-color' in st and float(st.get('fill-opacity', 1)) > 0: dr_element.area.border.color = mwm_encode_color(colors, st, "casing") dr_element.area.border.width = st.get('casing-width', 0) * WIDTH_SCALE