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

Merge branch 'fix-macos-pdfcontroller-test' into 'master'

Browse Source 
Fix the PDF Controller tests on macOS

See merge request openlp/openlp!240
This commit is contained in:
Tim Bentley 2020-09-26 20:06:34 +00:00
commit d41e0316f4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/functional/openlp_plugins/presentations/test_pdfcontroller.py
View File

@ -66,12 +66,8 @@ def get_screen_resolution():
Get the screen resolution Get the screen resolution
""" """
if is_macosx(): if is_macosx():
if IS_CI: # Magic numbers... don't ask me why
return 1024, 76 return 1024, 768
else:
from AppKit import NSScreen
screen_size = NSScreen.mainScreen().frame().size
return screen_size.width, screen_size.height
elif is_win(): elif is_win():
from win32api import GetSystemMetrics from win32api import GetSystemMetrics
return GetSystemMetrics(0), GetSystemMetrics(1) return GetSystemMetrics(0), GetSystemMetrics(1)