Merge lp:~osomon/oxide/contextmenu-position-physical-pixels into lp:~oxide-developers/oxide/oxide.trunk

Proposed by Olivier Tilloy
Status: Merged
Merged at revision: 1180
Proposed branch: lp:~osomon/oxide/contextmenu-position-physical-pixels
Merge into: lp:~oxide-developers/oxide/oxide.trunk
Diff against target: 24 lines (+6/-1)
1 file modified
qt/core/browser/oxide_qt_web_context_menu.cc (+6/-1)
To merge this branch: bzr merge lp:~osomon/oxide/contextmenu-position-physical-pixels
Reviewer Review Type Date Requested Status
Chris Coulson Pending
Review via email: mp+269640@code.launchpad.net

Commit message

Expose the context menu position in physical pixels.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'qt/core/browser/oxide_qt_web_context_menu.cc'
--- qt/core/browser/oxide_qt_web_context_menu.cc 2015-05-28 23:51:39 +0000
+++ qt/core/browser/oxide_qt_web_context_menu.cc 2015-08-31 13:45:23 +0000
@@ -24,6 +24,7 @@
24#include "base/strings/utf_string_conversions.h"24#include "base/strings/utf_string_conversions.h"
2525
26#include "qt/core/glue/oxide_qt_web_context_menu_proxy.h"26#include "qt/core/glue/oxide_qt_web_context_menu_proxy.h"
27#include "shared/browser/oxide_web_view.h"
2728
28namespace oxide {29namespace oxide {
29namespace qt {30namespace qt {
@@ -59,7 +60,11 @@
59}60}
6061
61QPoint WebContextMenu::position() const {62QPoint WebContextMenu::position() const {
62 return QPoint(params_.x, params_.y);63 // The position is expressed in device-independent pixels (DIP), it needs to
64 // be multiplied by the device pixel ratio (DPR) to obtain physical pixels.
65 oxide::WebView* webview = oxide::WebView::FromWebContents(web_contents());
66 const float dpr = webview->GetScreenInfo().deviceScaleFactor;
67 return QPoint(params_.x * dpr, params_.y * dpr);
63}68}
6469
65QUrl WebContextMenu::linkUrl() const {70QUrl WebContextMenu::linkUrl() const {

Subscribers

People subscribed via source and target branches