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

Get the screen resolution directly from Windows and X11, or return the previous resolution

Browse Source
This commit is contained in:
Raoul Snyman 2019-03-25 15:16:45 -07:00
parent efa446a356
commit 136735c53f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ from unittest.mock import MagicMock, patch
from PyQt5 import QtCore, QtGui from PyQt5 import QtCore, QtGui
from openlp.core.common import is_macosx from openlp.core.common import is_macosx, is_linux, is_win
from openlp.core.common.path import Path from openlp.core.common.path import Path
from openlp.core.common.settings import Settings from openlp.core.common.settings import Settings
from openlp.core.display.screens import ScreenList from openlp.core.display.screens import ScreenList
@ -58,6 +58,13 @@ def get_screen_resolution():
from AppKit import NSScreen from AppKit import NSScreen
screen_size = NSScreen.mainScreen().frame().size screen_size = NSScreen.mainScreen().frame().size
return screen_size.width, screen_size.height return screen_size.width, screen_size.height
elif is_win():
from win32api import GetSystemMetrics
return GetSystemMetrics(0), GetSystemMetrics(1)
elif is_linux():
from Xlib.display import Display
resolution = Display().screen().root.get_geometry()
return resolution.width, resolution.height
else: else:
return 1024, 768 return 1024, 768