Merge pull request #670 from reboot/fix_full_screen_projector
UI: Fix full screen projector on screens that have reserved areas
This commit is contained in:
commit
d4a10d2e27
3 changed files with 4 additions and 4 deletions
|
|
@ -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),
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue