Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
5a45a254 by wurstsalat at 2021-12-27T12:48:58+01:00
MessageRow: Fix message moderation for preview widget
- - - - -
7868af76 by wurstsalat at 2021-12-27T13:17:42+01:00
CodeWidget: Improve display of big snippets
- - - - -
853f9ed5 by wurstsalat at 2021-12-27T14:25:23+01:00
CSSConfig: Typing
- - - - -
3 changed files:
- gajim/gtk/conversation/code_widget.py
- gajim/gtk/conversation/rows/message.py
- gajim/gtk/css_config.py
Changes:
=====================================
gajim/gtk/conversation/code_widget.py
=====================================
@@ -58,6 +58,7 @@ def __init__(self, account: str) -> None:
Gtk.PolicyType.NEVER)
self._scrolled.set_hexpand(True)
self._scrolled.set_vexpand(True)
+ self._scrolled.set_propagate_natural_width(True)
self._scrolled.set_propagate_natural_height(True)
self._scrolled.set_max_content_height(400)
self._scrolled.add(self._textview)
@@ -95,7 +96,6 @@ def __init__(self) -> None:
GtkSource.View.__init__(self)
self.set_editable(False)
self.set_cursor_visible(False)
- self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR)
self.set_top_margin(2)
self.set_bottom_margin(2)
self.set_monospace(True)
=====================================
gajim/gtk/conversation/rows/message.py
=====================================
@@ -86,6 +86,7 @@ def __init__(self,
self.text = text
self.additional_data = additional_data
+ self._account = account
self._contact = contact
self._is_groupchat: bool = False
@@ -192,17 +193,17 @@ def __init__(self,
avatar_placeholder.set_valign(Gtk.Align.START)
avatar_placeholder.add(self._avatar_image)
- bottom_box = Gtk.Box(spacing=6)
- bottom_box.add(self._message_widget)
+ self._bottom_box = Gtk.Box(spacing=6)
+ self._bottom_box.add(self._message_widget)
more_menu_button = MoreMenuButton(self, self._contact, name)
more_menu_button.set_hexpand(True)
more_menu_button.set_halign(Gtk.Align.END)
- bottom_box.pack_end(more_menu_button, False, True, 0)
+ self._bottom_box.pack_end(more_menu_button, False, True, 0)
self.grid.attach(avatar_placeholder, 0, 0, 1, 2)
self.grid.attach(self._meta_box, 1, 0, 1, 1)
- self.grid.attach(bottom_box, 1, 1, 1, 1)
+ self.grid.attach(self._bottom_box, 1, 1, 1, 1)
self.show_all()
@@ -350,11 +351,16 @@ def set_displayed(self):
self._has_displayed = True
def set_retracted(self, text: str) -> None:
+ if isinstance(self._message_widget, PreviewWidget):
+ self._message_widget.destroy()
+ self._message_widget = MessageWidget(self._account)
+ self._bottom_box.pack_start(self._message_widget, True, True, 0)
self._message_widget.add_with_styling(text)
self.get_style_context().add_class('retracted-message')
def set_correction(self, text: str) -> None:
- self._message_widget.add_with_styling(text)
+ if not isinstance(self._message_widget, PreviewWidget):
+ self._message_widget.add_with_styling(text)
self._has_receipt = False
self._message_icons.set_receipt_icon_visible(False)
=====================================
gajim/gtk/css_config.py
=====================================
@@ -179,10 +179,9 @@ def _activate_css(self, css: str, priority: CSSPriority)
-> None:
log.exception('Error loading application css')
@staticmethod
- def _pango_to_css_weight(number: str) -> int:
+ def _pango_to_css_weight(number: int) -> int:
# Pango allows for weight values between 100 and 1000
# CSS allows only full hundred numbers like 100, 200 ..
- number = int(number)
if number < 100:
return 100
if number > 900:
@@ -325,10 +324,10 @@ def set_font(self,
def _get_attr_from_description(self,
description: Pango.FontDescription
- ) -> Tuple[Optional[str], int, str, int]:
+ ) -> Tuple[Optional[str], float, str, int]:
size = description.get_size() / Pango.SCALE
style = self._get_string_from_pango_style(description.get_style())
- weight = self._pango_to_css_weight(description.get_weight())
+ weight = self._pango_to_css_weight(int(description.get_weight()))
family = description.get_family()
return family, size, style, weight
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/17e9923ae82142fb6b97cd1ba41e72a2ce9838c1...853f9ed5b3ca85ec1eacfec2785422030d384998
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/17e9923ae82142fb6b97cd1ba41e72a2ce9838c1...853f9ed5b3ca85ec1eacfec2785422030d384998
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
