sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Use consistent ellipsis mode"

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/sugar3/graphics/palette.py
View File

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

3
src/sugar3/graphics/style.py
View File

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