raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Renderer screen and font fixes

Browse Source
This commit is contained in:
Tim Bentley 2010-03-13 20:50:52 +00:00
parent 2d934c8ed9
commit 3b59525e98
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openlp/core/lib/renderer.py
View File

@ -43,8 +43,6 @@ class Renderer(object):
""" """
self._rect = None self._rect = None
self._debug = False self._debug = False
# the amount of right indent
self._right_margin = 64
self._display_shadow_size_footer = 0 self._display_shadow_size_footer = 0
self._display_outline_size_footer = 0 self._display_outline_size_footer = 0
self.theme_name = None self.theme_name = None
@ -150,7 +148,7 @@ class Renderer(object):
def pre_render_text(self, text): def pre_render_text(self, text):
metrics = QtGui.QFontMetrics(self.mainFont) metrics = QtGui.QFontMetrics(self.mainFont)
#work out line width #work out line width
line_width = self._rect.width() #- self._right_margin line_width = self._rect.width()
#number of lines on a page - adjust for rounding up. #number of lines on a page - adjust for rounding up.
line_height = metrics.height() line_height = metrics.height()
if self._theme.display_shadow: if self._theme.display_shadow:
@ -449,8 +447,7 @@ class Renderer(object):
rightextent = x + w rightextent = x + w
# shift right from last line's rh edge # shift right from last line's rh edge
if self._theme.display_wrapStyle == 1 and linenum != 0: if self._theme.display_wrapStyle == 1 and linenum != 0:
rightextent = self._first_line_right_extent #+ \ rightextent = self._first_line_right_extent
#self._right_margin
if rightextent > maxx: if rightextent > maxx:
rightextent = maxx rightextent = maxx
x = rightextent - w x = rightextent - w

4
openlp/core/lib/rendermanager.py
View File

@ -146,13 +146,13 @@ class RenderManager(object):
footer_rect = None footer_rect = None
if not theme.font_main_override: if not theme.font_main_override:
main_rect = QtCore.QRect(10, 0, main_rect = QtCore.QRect(10, 0,
self.width - 1, self.footer_start) self.width - 20, self.footer_start)
else: else:
main_rect = QtCore.QRect(theme.font_main_x, theme.font_main_y, main_rect = QtCore.QRect(theme.font_main_x, theme.font_main_y,
theme.font_main_width - 1, theme.font_main_height - 1) theme.font_main_width - 1, theme.font_main_height - 1)
if not theme.font_footer_override: if not theme.font_footer_override:
footer_rect = QtCore.QRect(10, self.footer_start, footer_rect = QtCore.QRect(10, self.footer_start,
self.width - 1, self.height - self.footer_start) self.width - 20, self.height - self.footer_start)
else: else:
footer_rect = QtCore.QRect(theme.font_footer_x, footer_rect = QtCore.QRect(theme.font_footer_x,
theme.font_footer_y, theme.font_footer_width - 1, theme.font_footer_y, theme.font_footer_width - 1,