mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-16 13:37:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #670 from reboot/fix_full_screen_projector

Browse Source 
UI: Fix full screen projector on screens that have reserved areas
This commit is contained in:
Jim
2016-10-20 06:49:09 -07:00
committed by GitHub
parent 83fa6e728a 623c9dc41a
commit d4a10d2e27
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UI/window-basic-main.cpp
View File

@@ -141,7 +141,7 @@ OBSBasic::OBSBasic(QWidget *parent)
QRect windowGeometry = normalGeometry();
if (!WindowPositionValid(windowGeometry)) {
QRect rect = App()->desktop()->availableGeometry();
QRect rect = App()->desktop()->geometry();
setGeometry(QStyle::alignedRect(
Qt::LeftToRight,
Qt::AlignCenter,
@@ -2774,7 +2774,7 @@ static void AddProjectorMenuMonitors(QMenu *parent, QObject *target,
QAction *action;
QList<QScreen*> screens = QGuiApplication::screens();
for (int i = 0; i < screens.size(); i++) {
QRect screenGeometry = screens[i]->availableGeometry();
QRect screenGeometry = screens[i]->geometry();
QString str = QString("%1 %2: %3x%4 @ %5,%6").
arg(QTStr("Display"),
QString::number(i),

2
UI/window-basic-settings.cpp
View File

@@ -1101,7 +1101,7 @@ void OBSBasicSettings::LoadResolutionLists()
ui->baseResolution->clear();
for (QScreen* screen: QGuiApplication::screens()) {
QSize as = screen->availableSize();
QSize as = screen->size();
string res = ResString(as.width(), as.height());
ui->baseResolution->addItem(res.c_str());
}

2
UI/window-projector.cpp
View File

@@ -50,7 +50,7 @@ OBSProjector::~OBSProjector()
void OBSProjector::Init(int monitor)
{
QScreen *screen = QGuiApplication::screens()[monitor];
setGeometry(screen->availableGeometry());
setGeometry(screen->geometry());
bool alwaysOnTop = config_get_bool(GetGlobalConfig(),
"BasicWindow", "ProjectorAlwaysOnTop");