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

Remove "dynamic" font height computation #8392 (marco)

Browse Source
This commit is contained in:
Simon Schampijer 2008-09-10 12:36:27 +02:00
parent 1d29440bfd
commit 2e41124c87
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sugar/graphics/style.py
View File

@ -46,15 +46,6 @@ def _compute_zoom_factor():
return 1.0 return 1.0
def _compute_font_height(font):
widget = gtk.Label('')
context = widget.get_pango_context()
pango_font = context.load_font(font.get_pango_desc())
metrics = pango_font.get_metrics()
return pango.PIXELS(metrics.get_ascent() + metrics.get_descent())
class Font(object): class Font(object):
def __init__(self, desc): def __init__(self, desc):
self._desc = desc self._desc = desc
@ -124,8 +115,8 @@ XLARGE_ICON_SIZE = zoom(55 * 2.75)
FONT_SIZE = zoom(7 * _XO_DPI / _get_screen_dpi()) FONT_SIZE = zoom(7 * _XO_DPI / _get_screen_dpi())
FONT_NORMAL = Font('Bitstream Vera Sans %d' % FONT_SIZE) FONT_NORMAL = Font('Bitstream Vera Sans %d' % FONT_SIZE)
FONT_BOLD = Font('Bitstream Vera Sans bold %d' % FONT_SIZE) FONT_BOLD = Font('Bitstream Vera Sans bold %d' % FONT_SIZE)
FONT_NORMAL_H = _compute_font_height(FONT_NORMAL) FONT_NORMAL_H = zoom(24)
FONT_BOLD_H = _compute_font_height(FONT_BOLD) FONT_BOLD_H = zoom(24)
TOOLBOX_SEPARATOR_HEIGHT = zoom(9) TOOLBOX_SEPARATOR_HEIGHT = zoom(9)
TOOLBOX_HORIZONTAL_PADDING = zoom(75) TOOLBOX_HORIZONTAL_PADDING = zoom(75)