summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-25 17:16:49 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-08-27 14:03:41 +0000
commit281f8c2e4a5787aadf4c978139358141f626b8a4 (patch)
tree833a481c1290d3eea4ea8f29bd7f20b387581507 /src/webenginewidgets
parent8cd47a6df005ae61dbc366b884bebeb0ec49e889 (diff)
Add exit full screen web action
Adds a web action that can be used for exiting fullscreen mode, and include it the context menu whenever in fullscreen mode. Change-Id: I7aa729a86f9ba9df476766cd40f87d9385948fea Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.cpp8
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 1cf51df72..472e95871 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -595,6 +595,9 @@ QAction *QWebEnginePage::action(WebAction action) const
case InspectElement:
text = tr("Inspect Element");
break;
+ case ExitFullScreen:
+ text = tr("Exit Full Screen Mode");
+ break;
default:
break;
}
@@ -762,6 +765,9 @@ void QWebEnginePage::triggerAction(WebAction action, bool)
case InspectElement:
d->adapter->inspectElementAt(d->m_menuData.pos);
break;
+ case ExitFullScreen:
+ d->adapter->exitFullScreen();
+ break;
default:
Q_UNREACHABLE();
}
@@ -968,6 +974,8 @@ QMenu *QWebEnginePage::createStandardContextMenu()
} else if (contextMenuData.mediaType == WebEngineContextMenuData::MediaTypeCanvas) {
menu->addAction(QWebEnginePage::action(CopyImageToClipboard));
}
+ if (d->isFullScreen())
+ menu->addAction(QWebEnginePage::action(ExitFullScreen));
return menu;
}
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index c324f3737..d027998ee 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -107,6 +107,7 @@ public:
DownloadMediaToDisk,
InspectElement,
+ ExitFullScreen,
WebActionCount
};