diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-06 14:45:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-07 15:06:47 +0000 |
commit | 99d46a8a918dee7323bc3d4f1624c47c097f9a3a (patch) | |
tree | 2070028bb48eed331f16e12afbd553dd31fb6db3 /src/core | |
parent | c453b750ecb5311ae0a32d3d2cca9e2871fb9c50 (diff) |
Introduce RenderWidgetHostViewQtDelegateQuick::windowGeometry()
Leave it up to hostview delegate to report window geometry.
Change-Id: I19a4b911aa493fbc6f66c6169e7fbbb7bf674217
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt_delegate.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 8b1a9075b..994e3a3d6 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -934,9 +934,9 @@ void RenderWidgetHostViewQt::visualPropertiesChanged() m_viewRectInDips = toGfx(m_delegate->viewGeometry().toAlignedRect()); gfx::Rect oldWindowRect = m_windowRectInDips; - QWindow *window = m_delegate->window(); - m_windowRectInDips = window ? toGfx(window->frameGeometry()) : gfx::Rect(); + m_windowRectInDips = toGfx(m_delegate->windowGeometry()); + QWindow *window = m_delegate->window(); content::ScreenInfo oldScreenInfo = m_screenInfo; m_screenInfo = screenInfoFromQScreen(window ? window->screen() : nullptr); diff --git a/src/core/render_widget_host_view_qt_delegate.h b/src/core/render_widget_host_view_qt_delegate.h index cbf92a8d4..6066284d9 100644 --- a/src/core/render_widget_host_view_qt_delegate.h +++ b/src/core/render_widget_host_view_qt_delegate.h @@ -91,6 +91,7 @@ public: virtual ~RenderWidgetHostViewQtDelegate() { } virtual void initAsPopup(const QRect&) = 0; virtual QRectF viewGeometry() const = 0; + virtual QRect windowGeometry() const = 0; virtual void setKeyboardFocus() = 0; virtual bool hasKeyboardFocus() = 0; virtual void lockMouse() = 0; |