← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~erik-lundin/openlp/output-width into lp:openlp

 

Erik Lundin has proposed merging lp:~erik-lundin/openlp/output-width into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~erik-lundin/openlp/output-width/+merge/123378

Fixes the width of the default main output area. It has a left margin of 10 pixels, but the width was set to the screen width, which caused the output area to extend outside the right border of the screen. Solution: set the output width to the screen width minus 20 pixels (just like for the footer output area).
-- 
https://code.launchpad.net/~erik-lundin/openlp/output-width/+merge/123378
Your team OpenLP Core is requested to review the proposed merge of lp:~erik-lundin/openlp/output-width into lp:openlp.
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2012-08-30 18:11:00 +0000
+++ openlp/core/lib/renderer.py	2012-09-07 22:31:28 +0000
@@ -365,7 +365,7 @@
             The theme information
         """
         if not theme_data.font_main_override:
-            return QtCore.QRect(10, 0, self.width, self.footer_start)
+            return QtCore.QRect(10, 0, self.width - 20, self.footer_start)
         else:
             return QtCore.QRect(theme_data.font_main_x, theme_data.font_main_y,
                 theme_data.font_main_width - 1, theme_data.font_main_height - 1)


Follow ups