Merge lp:~unity-team/oxide/locationBarHeightOnScreenChange into lp:~oxide-developers/oxide/oxide.trunk

[Gerry Boland]

On screen scale change, need to recalculate the height of the location bar in terms of the new scale

[Michał Sawicz (saviq)]

../../../../qt/core/browser/oxide_qt_web_view.cc: In member function ‘virtual void oxide::qt::WebView::updateLocationBarHeight() const’:
../../../../qt/core/browser/oxide_qt_web_view.cc:942:44: error: passing ‘const oxide::qt::WebView’ as ‘this’ argument discards qualifiers [-fpermissive]
   setLocationBarHeight(location_bar_height_);
                                            ^
../../../../qt/core/browser/oxide_qt_web_view.cc:934:6: note: in call to ‘virtual void oxide::qt::WebView::setLocationBarHeight(int)’
 void WebView::setLocationBarHeight(int height) {

:/

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Thanks, I've left a couple of comments inline

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Thanks, there's a couple of bits that can be deleted now (see the comments inline)

review: Needs Fixing

[Gerry Boland (gerboland)]

Yep, done that (hadn't pushed), but now the offset of the location bar is wrong. Investigating (and marked the MP WIP, to avoid annoying you until I'm ready)

[Gerry Boland (gerboland)]

Chris has tested and not seeing the issue I was finding. I blame a deployment problem on my end. I'm going to double-check it, but this should be good to go

=== modified file 'qt/core/browser/oxide_qt_contents_view.cc'
--- qt/core/browser/oxide_qt_contents_view.cc	2016-04-20 22:09:41 +0000
+++ qt/core/browser/oxide_qt_contents_view.cc	2016-04-29 13:18:57 +0000
@@ -54,6 +54,7 @@
 #include "oxide_qt_type_conversions.h"
 #include "oxide_qt_web_context_menu.h"
 #include "oxide_qt_web_popup_menu.h"
+#include "oxide_qt_web_view.h"
 
 namespace oxide {
 namespace qt {
@@ -274,6 +275,11 @@
 
 void ContentsView::screenUpdated() {
   view()->ScreenUpdated();
+
+  // FIXME - need to recalculate location bar height in case scale changed
+  oxide::qt::WebView::FromView(
+    oxide::WebView::FromWebContents(view()->GetWebContents()))
+      ->RescaleLocationBarHeight();
 }
 
 QVariant ContentsView::inputMethodQuery(Qt::InputMethodQuery query) const {
 
=== modified file 'qt/core/browser/oxide_qt_web_view.cc'
--- qt/core/browser/oxide_qt_web_view.cc	2016-04-21 09:53:42 +0000
+++ qt/core/browser/oxide_qt_web_view.cc	2016-04-29 13:18:57 +0000
@@ -249,6 +249,7 @@
     : contents_view_(new ContentsView(view_client, handle)),
       client_(client),
       security_status_(security_status),
+      location_bar_height_(0),
       frame_tree_torn_down_(false) {
   DCHECK(client);
   DCHECK(handle);
@@ -946,16 +947,21 @@
 }
 
 int WebView::locationBarHeight() const {
-  return DpiUtils::ConvertChromiumPixelsToQt(
-      web_view_->GetLocationBarHeight(), contents_view_->GetScreen());
+  return location_bar_height_;
 }
 
 void WebView::setLocationBarHeight(int height) {
+  location_bar_height_ = height;
   web_view_->SetLocationBarHeight(
       DpiUtils::ConvertQtPixelsToChromium(height,
                                           contents_view_->GetScreen()));
 }
 
+ // FIXME: called on screen change, to recalculate location bar height if scale changed
+void WebView::RescaleLocationBarHeight() {
+  setLocationBarHeight(location_bar_height_);
+}
+
 int WebView::locationBarOffset() const {
   return DpiUtils::ConvertChromiumPixelsToQt(
       web_view_->GetLocationBarOffset(), contents_view_->GetScreen());
 
=== modified file 'qt/core/browser/oxide_qt_web_view.h'
--- qt/core/browser/oxide_qt_web_view.h	2016-04-20 22:09:41 +0000
+++ qt/core/browser/oxide_qt_web_view.h	2016-04-29 13:18:57 +0000
@@ -88,6 +88,8 @@
 
   const oxide::SecurityStatus& GetSecurityStatus() const;
 
+  void RescaleLocationBarHeight(); //FIXME: called on screen change only
+
  private:
   WebView(WebViewProxyClient* client,
           ContentsViewProxyClient* view_client,
@@ -276,6 +278,7 @@
   QPointer<OxideQSecurityStatus> security_status_;
   QList<QObject*> message_handlers_;
 
+  int location_bar_height_;
   bool frame_tree_torn_down_;
 
   std::unique_ptr<content::HostZoomMap::Subscription> track_zoom_subscription_;