diff options
| author | Gonzalo Odiard <godiard@gmail.com> | 2014-07-11 12:48:46 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@gmail.com> | 2014-07-14 11:00:09 (GMT) |
| commit | 0781c3b0d3a6769752702bf0212a8b7405ca718e (patch) | |
| tree | dddaa39b3425094d0a4e089666bfddc3e6a357a6 | |
| parent | ec5dc7d4bb59d7432d13402557ad7d9df3e8f791 (diff) | |
Remove the use of the opacity property
| -rw-r--r-- | cardlist.py | 6 | ||||
| -rw-r--r-- | svgcard.py | 28 |
2 files changed, 14 insertions, 20 deletions
diff --git a/cardlist.py b/cardlist.py index 2e9a68c..216402e 100644 --- a/cardlist.py +++ b/cardlist.py @@ -286,8 +286,7 @@ class CardPair(Gtk.EventBox): 'speak': aspeak, 'text_color': style.Color('#ffffff')}, 'front': {'fill_color': style.Color('#4c4d4f'), - 'stroke_color': style.Color('#ffffff'), - 'opacity': '1'}}, + 'stroke_color': style.Color('#ffffff')}}, None, theme.PAIR_SIZE, 1, self.bg_color, font_name1) self.bcard1.flip() self.bcard1.set_pixbuf(aimg) @@ -300,8 +299,7 @@ class CardPair(Gtk.EventBox): 'speak': bspeak, 'text_color': style.Color('#ffffff')}, 'front': {'fill_color': style.Color('#4c4d4f'), - 'stroke_color': style.Color('#ffffff'), - 'opacity': '1'}}, + 'stroke_color': style.Color('#ffffff')}}, None, theme.PAIR_SIZE, 1, self.bg_color, font_name2) self.bcard2.flip() self.bcard2.set_pixbuf(bimg) @@ -49,12 +49,10 @@ class SvgCard(Gtk.EventBox): # Default properties default_props = {} default_props['back'] = {'fill_color': style.Color('#b2b3b7'), - 'stroke_color': style.Color('#b2b3b7'), - 'opacity': '1'} + 'stroke_color': style.Color('#b2b3b7')} default_props['back_text'] = {'text_color': style.Color('#c7c8cc')} default_props['front'] = {'fill_color': style.Color('#4c4d4f'), - 'stroke_color': style.Color('#ffffff'), - 'opacity': '1'} + 'stroke_color': style.Color('#ffffff')} default_props['front_text'] = {'text_color': '#ffffff'} def __init__(self, identifier, pprops, jpeg, size, @@ -105,18 +103,16 @@ class SvgCard(Gtk.EventBox): # draw the border icon_data = self.props[self.current_face] context.save() - if icon_data.get('opacity', '') == '1': - self.draw_round_rect(context, 0, 0, self.size, self.size, radio) - if 'fill_color' in icon_data: - r, g, b, a = icon_data['fill_color'].get_rgba() - context.set_source_rgb(r, g, b) - context.fill_preserve() - if 'stroke_color' in icon_data: - r, g, b, a = icon_data['stroke_color'].get_rgba() - context.set_source_rgb(r, g, b) - context.set_line_width(6) - context.stroke() - + self.draw_round_rect(context, 0, 0, self.size, self.size, radio) + if 'fill_color' in icon_data: + r, g, b, a = icon_data['fill_color'].get_rgba() + context.set_source_rgb(r, g, b) + context.fill_preserve() + if 'stroke_color' in icon_data: + r, g, b, a = icon_data['stroke_color'].get_rgba() + context.set_source_rgb(r, g, b) + context.set_line_width(6) + context.stroke() context.restore() if self.show_jpeg: |