Philipp Hörist pushed to branch master at gajim / gajim
Commits:
63ff9478 by Philipp Hörist at 2018-11-16T15:23:42Z
XHTML: Fix parsing font-size
Remove checking for font_scale, Gtk.TextIter.get_attributes() seems buggy at
the moment, and we dont need to check the current scale to apply a new scale
Fixes #9067
- - - - -
2 changed files:
- gajim/htmltextview.py
- test/gtk/htmltextview.py
Changes:
=====================================
gajim/htmltextview.py
=====================================
@@ -230,13 +230,6 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
tag.set_property('background-gdk', color)
tag.set_property('paragraph-background-gdk', color)
- def _get_current_attributes(self):
- attrs = self.textview.get_default_attributes()
- self.iter.backward_char()
- attrs = (self.iter.get_attributes())[1]
- self.iter.forward_char()
- return attrs
-
def __parse_length_frac_size_allocate(self, textview, allocation, frac,
callback, args):
callback(allocation.width*frac, *args)
@@ -338,30 +331,19 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
def _parse_style_font_size(self, tag, value):
try:
- # see
http://developer.gnome.org/pango/stable/pango-Text-Attributes.html#PANGO-SCALE-XX-SMALL:CAPS
- #
http://consciouslyusing.blogspot.ru/2012/01/heads-up-missing-pango-text-scale.html
scale = {
- #'xx-small': Pango.SCALE_XX_SMALL,
- #'x-small': Pango.SCALE_X_SMALL,
- #'small': Pango.SCALE_SMALL,
- #'medium': Pango.SCALE_MEDIUM,
- #'large': Pango.SCALE_LARGE,
- #'x-large': Pango.SCALE_X_LARGE,
- #'xx-large': Pango.SCALE_XX_LARGE,
- 'xx-small': 0.5787037037037,
- 'x-small': 0.6444444444444,
- 'small': 0.8333333333333,
- 'medium': 1.0,
- 'large': 1.2,
- 'x-large': 1.4399999999999,
- 'xx-large': 1.728,
- }[value]
+ 'xx-small': 0.5787037037037,
+ 'x-small': 0.6444444444444,
+ 'small': 0.8333333333333,
+ 'medium': 1.0,
+ 'large': 1.2,
+ 'x-large': 1.4399999999999,
+ 'xx-large': 1.728,
+ }[value]
except KeyError:
pass
else:
- attrs = self._get_current_attributes()
- if attrs.font_scale == 0:
- tag.set_property('scale', scale)
+ tag.set_property('scale', scale)
return
if value == 'smaller':
tag.set_property('scale', 0.8333333333333)
=====================================
test/gtk/htmltextview.py
=====================================
@@ -19,6 +19,10 @@ app.interface = Interface()
XHTML = [
+ '''
+ <body xmlns='http://www.w3.org/1999/xhtml'><p><span style='font-size:
xx-large;'>rexxnor: i nimes chum a...</span></p></body>
+ ''',
+
'''
<div>
<span style="color: red; text-decoration:underline">Hello</span>
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/63ff9478bd3eee0c5c150e8420af94a4f15e616e
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/63ff9478bd3eee0c5c150e8420af94a4f15e616e
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
