Philipp Hörist pushed to branch master at gajim / gajim
Commits:
b86c5afa by Philipp Hörist at 2019-06-12T17:23:38Z
Unpack colors correctly
- - - - -
239b34f4 by Philipp Hörist at 2019-06-12T17:39:11Z
Dont use deprecated Gdk.Color
- - - - -
3 changed files:
- gajim/conversation_textview.py
- gajim/gtk/htmltextview.py
- gajim/gtk/util.py
Changes:
=====================================
gajim/conversation_textview.py
=====================================
@@ -1253,8 +1253,8 @@ class ConversationTextview(GObject.GObject):
def _add_new_colour_tags(self, tag, name):
if self._buffer.get_tag_table().lookup(tag) is not None:
return
- gdk_color = Gdk.Color.from_floats(*text_to_color(name))
- self._buffer.create_tag(tag, foreground_gdk=gdk_color)
+ rgba = Gdk.RGBA(*text_to_color(name))
+ self._buffer.create_tag(tag, foreground_rgba=rgba)
def print_subject(self, subject, iter_=None):
if subject: # if we have subject, show it too!
=====================================
gajim/gtk/htmltextview.py
=====================================
@@ -193,10 +193,11 @@ for _name in BLOCK_HEAD:
('font-weight: bold', 'font-style: oblique')[_weight])
def _parse_css_color(color):
- if color.startswith('rgb(') and color.endswith(')'):
- red, green, blue = [int(c)*257 for c in color[4:-1].split(',')]
- return Gdk.Color(red, green, blue)
- return Gdk.color_parse(color)
+ rgba = Gdk.RGBA()
+ success = rgba.parse(color)
+ if not success:
+ log.warning('Can\'t parse color: %s', color)
+ return rgba
def style_iter(style):
return ([x.strip() for x in item.split(':', 1)] for item in
style.split(';')\
@@ -237,13 +238,13 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
@staticmethod
def _parse_style_color(tag, value):
color = _parse_css_color(value)
- tag.set_property('foreground-gdk', color)
+ tag.set_property('foreground-rgba', color)
@staticmethod
def _parse_style_background_color(tag, value):
color = _parse_css_color(value)
- tag.set_property('background-gdk', color)
- tag.set_property('paragraph-background-gdk', color)
+ tag.set_property('background-rgba', color)
+ tag.set_property('paragraph-background-rgba', color)
@staticmethod
def __parse_length_frac_size_allocate(_textview, allocation, frac,
=====================================
gajim/gtk/util.py
=====================================
@@ -623,7 +623,7 @@ def find_widget(name, container):
@lru_cache(maxsize=1024)
def generate_avatar(letters, color, size, scale):
# Get color for nickname with XEP-0392
- color_r, color_b, color_g = color
+ color_r, color_g, color_b = color
# Set up colors and size
if scale is not None:
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943aeb7c337...239b34f4f41a312dcb24377bf34b7f2d0e086501
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/de982e963b80f23c28c1988ec86bc943aeb7c337...239b34f4f41a312dcb24377bf34b7f2d0e086501
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
