diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-15 15:26:30 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-04 23:54:23 +0100 |
| commit | 029771bcd254b6cf873badd538e3f762d6344f6b (patch) | |
| tree | 77a4384e9d6d8a37372eed76be036c01ebd3586d /src/core/render_widget_host_view_qt.cpp | |
| parent | 891b97e59d2a68bc24d36eceebd18b71027c66d1 (diff) | |
Set more Display properties
Task-number: QTBUG-76006
Change-Id: If2b39b3dc66e250f6a4b333e4d82d0d43f8dedd8
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 2427d47bc..c49850929 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -59,6 +59,7 @@ #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/compositor/image_transport_factory.h" #include "content/browser/compositor/surface_utils.h" +#include "content/browser/renderer_host/display_util.h" #include "content/browser/renderer_host/frame_tree.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" @@ -260,19 +261,17 @@ private: const QTouchEvent::TouchPoint& touchPoint(size_t i) const { return touchPoints[i].second; } }; +extern display::Display toDisplayDisplay(int id, const QScreen *screen); + static blink::ScreenInfo screenInfoFromQScreen(QScreen *screen) { blink::ScreenInfo r; - if (screen) { - r.device_scale_factor = screen->devicePixelRatio(); - r.depth_per_component = 8; - r.depth = screen->depth(); - r.is_monochrome = (r.depth == 1); - r.rect = toGfx(screen->geometry()); - r.available_rect = toGfx(screen->availableGeometry()); - } else { + if (!screen) + screen = qApp->primaryScreen(); + if (screen) + content::DisplayUtil::DisplayToScreenInfo(&r, toDisplayDisplay(0, screen)); + else r.device_scale_factor = qGuiApp->devicePixelRatio(); - } return r; } |