Modify the obs_display API so that it always uses an orthographic projection that is the size of the display, rather than OBS' base size. Having it do an orthographic projection to OBS' base size was silly because it meant that everything would be skewed if you wanted to draw 1:1 in the display. This deoes mean that the callbacks must handle resizing the images, but it's worth it to ensure 1:1 draw sizes. As for the preview widget, instead of making some funky widget within widget that resizes, it's just going to be a widget within the entire top layout. Also changed the preview padding color to gray.
49 lines
1.5 KiB
C++
49 lines
1.5 KiB
C++
/******************************************************************************
|
|
Copyright (C) 2013 by Hugh Bailey <obs.jim@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
******************************************************************************/
|
|
|
|
#include "qt-wrappers.hpp"
|
|
#include <graphics/graphics.h>
|
|
#include <QWidget>
|
|
#include <QMessageBox>
|
|
|
|
static inline void OBSErrorBoxva(QWidget *parent, const char *msg, va_list args)
|
|
{
|
|
char full_message[4096];
|
|
vsnprintf(full_message, 4095, msg, args);
|
|
|
|
QMessageBox::information(parent, "Error", full_message);
|
|
}
|
|
|
|
void OBSErrorBox(QWidget *parent, const char *msg, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, msg);
|
|
OBSErrorBoxva(parent, msg, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void QTToGSWindow(WId windowId, gs_window &gswindow)
|
|
{
|
|
#ifdef _WIN32
|
|
gswindow.hwnd = (HWND)windowId;
|
|
#elif __APPLE__
|
|
gswindow.view = (id)windowId;
|
|
#else
|
|
gswindow.id = windowId;
|
|
#endif
|
|
}
|