[Fixed fonts in the chat web view Dan Pascu **20151103141635 Ignore-this: dcf15a4d02d082e19de7e29b3cadb573 ] hunk ./blink/chatwindow.py 381 - def setChatFont(self, family, size): - settings = self.settings() - settings.setFontFamily(QWebSettings.StandardFont, family) - settings.setFontFamily(QWebSettings.FixedFont, family) - settings.setFontFamily(QWebSettings.SerifFont, family) - settings.setFontFamily(QWebSettings.SansSerifFont, family) - settings.setFontSize(QWebSettings.DefaultFontSize, size) - settings.setFontSize(QWebSettings.DefaultFixedFontSize, size) - self.update() - hunk ./blink/chatwindow.py 567 + self.font_family = blink_settings.chat_window.font or self.style.font_family + self.font_size = blink_settings.chat_window.font_size or self.style.font_size hunk ./blink/chatwindow.py 570 - self.chat_view.setChatFont(blink_settings.chat_window.font or self.style.font_family, blink_settings.chat_window.font_size or self.style.font_size) - self.chat_view.setHtml(self.chat_template.format(base_url=FileURL(self.style.path)+'/', style_url=self.style_variant+'.style')) + self.chat_view.setHtml(self.chat_template.format(base_url=FileURL(self.style.path)+'/', style_url=self.style_variant+'.style', font_family=self.font_family, font_size=self.font_size)) hunk ./blink/preferences.py 856 + font_family = blink_settings.chat_window.font or style.font_family + font_size = blink_settings.chat_window.font_size or style.font_size hunk ./blink/preferences.py 860 - self.style_view.setChatFont(blink_settings.chat_window.font or style.font_family, blink_settings.chat_window.font_size or style.font_size) - self.style_view.setHtml(self.style_view.template.format(base_url=FileURL(style.path)+'/', style_url=style_variant+'.style')) + self.style_view.setHtml(self.style_view.template.format(base_url=FileURL(style.path)+'/', style_url=style_variant+'.style', font_family=font_family, font_size=font_size)) hunk ./resources/chat/template.html 20 + + +