Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-09 10:19:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5608 from jherico/marge

Browse source 
Add fullscreen menu item to 2D display plugin
This commit is contained in:
Brad Hefta-Gaub 2015-08-20 11:02:34 -07:00
commit 0e506fa663
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.cpp
View file

@ -9,12 +9,11 @@
#include <plugins/PluginContainer.h> #include <plugins/PluginContainer.h>
#include <QWindow> #include <QWindow>
#include <QGuiApplication>
const QString Basic2DWindowOpenGLDisplayPlugin::NAME("2D Display"); const QString Basic2DWindowOpenGLDisplayPlugin::NAME("2D Display");
const QString MENU_PARENT = "View"; const QString MENU_PATH = "Display";
const QString MENU_NAME = "Display Options";
const QString MENU_PATH = MENU_PARENT + ">" + MENU_NAME;
const QString FULLSCREEN = "Fullscreen"; const QString FULLSCREEN = "Fullscreen";
const QString& Basic2DWindowOpenGLDisplayPlugin::getName() const { const QString& Basic2DWindowOpenGLDisplayPlugin::getName() const {
@ -22,16 +21,19 @@ const QString& Basic2DWindowOpenGLDisplayPlugin::getName() const {
} }
void Basic2DWindowOpenGLDisplayPlugin::activate() { void Basic2DWindowOpenGLDisplayPlugin::activate() {
// container->addMenu(MENU_PATH); CONTAINER->addMenu(MENU_PATH);
// container->addMenuItem(MENU_PATH, FULLSCREEN, CONTAINER->addMenuItem(MENU_PATH, FULLSCREEN,
// [this] (bool clicked) { this->setFullscreen(clicked); }, [this](bool clicked) {
// true, false); if (clicked) {
CONTAINER->setFullscreen(getFullscreenTarget());
} else {
CONTAINER->unsetFullscreen();
}
}, true, false);
MainWindowOpenGLDisplayPlugin::activate(); MainWindowOpenGLDisplayPlugin::activate();
} }
void Basic2DWindowOpenGLDisplayPlugin::deactivate() { void Basic2DWindowOpenGLDisplayPlugin::deactivate() {
// container->removeMenuItem(MENU_NAME, FULLSCREEN);
// container->removeMenu(MENU_PATH);
MainWindowOpenGLDisplayPlugin::deactivate(); MainWindowOpenGLDisplayPlugin::deactivate();
} }
@ -54,4 +56,9 @@ bool Basic2DWindowOpenGLDisplayPlugin::isThrottled() const {
} }
return shouldThrottle; return shouldThrottle;
} }
// FIXME target the screen the window is currently on
QScreen* Basic2DWindowOpenGLDisplayPlugin::getFullscreenTarget() {
return qApp->primaryScreen();
}

3
libraries/display-plugins/src/display-plugins/Basic2DWindowOpenGLDisplayPlugin.h
View file

@ -9,6 +9,7 @@
#include "MainWindowOpenGLDisplayPlugin.h" #include "MainWindowOpenGLDisplayPlugin.h"
class QScreen;
class Basic2DWindowOpenGLDisplayPlugin : public MainWindowOpenGLDisplayPlugin { class Basic2DWindowOpenGLDisplayPlugin : public MainWindowOpenGLDisplayPlugin {
Q_OBJECT Q_OBJECT
@ -26,4 +27,6 @@ protected:
private: private:
static const QString NAME; static const QString NAME;
QScreen* getFullscreenTarget();
int _fullscreenTarget{ -1 };
}; };