Revert "Use consistent ellipsis mode"

This reverts commit 0d428fc913.

This is not the right solution. We should ellipse at the end.
The change was not discussed or approved.
This commit is contained in:
Gonzalo Odiard 2014-12-04 18:19:05 -03:00
parent 2b634b6d0c
commit 50ac9f36d6
2 changed files with 2 additions and 7 deletions

View File

@ -277,8 +277,7 @@ class Palette(PaletteWindow):
self._secondary_label.set_max_width_chars(
style.MENU_WIDTH_CHARS)
self._secondary_label.set_line_wrap(True)
self._secondary_label.set_ellipsize(
style.DEFAULT_ELLIPSIS_MODE)
self._secondary_label.set_ellipsize(Pango.EllipsizeMode.END)
self._secondary_label.set_lines(NO_OF_LINES)
self._secondary_label.set_justify(Gtk.Justification.FILL)
else:
@ -286,8 +285,7 @@ class Palette(PaletteWindow):
body_width = NO_OF_LINES * style.MENU_WIDTH_CHARS
body_width -= ELLIPSIS_LENGTH
if len(label) > body_width:
label = label[0:style.DEFAULT_ELLIPSIS_CHARACTERS] + \
'...' + label[-style.DEFAULT_ELLIPSIS_CHARACTERS:]
label = ' '.join(label[:body_width].split()[:-1]) + '...'
label = textwrap.fill(label, width=style.MENU_WIDTH_CHARS)
self._secondary_text = label

View File

@ -147,6 +147,3 @@ PALETTE_CURSOR_DISTANCE = zoom(10)
TOOLBAR_ARROW_SIZE = zoom(24)
MENU_WIDTH_CHARS = 60
DEFAULT_ELLIPSIS_MODE = Pango.EllipsizeMode.MIDDLE
DEFAULT_ELLIPSIS_CHARACTERS = 7