[maptips] fix 0,0 size by resizing widget to content when html loaded

nirvn · nirvn · commit 95e62036ae5d · 2018-07-19T08:45:39.000+07:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9336,7 +9336,6 @@ void QgisApp::saveLastMousePosition( const QgsPointXY &p )
       mpMaptip->clear( mMapCanvas );
       // don't start the timer if the mouse is not over the map canvas
       mpMapTipsTimer->start();
-      //QgsDebugMsg("Started maptips timer");
     }
   }
 }
diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp
@@ -67,6 +67,7 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
   mWebView->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );//Handle link clicks by yourself
   mWebView->setContextMenuPolicy( Qt::NoContextMenu ); //No context menu is allowed if you don't need it
   connect( mWebView, &QWebView::linkClicked, this, &QgsMapTip::onLinkClicked );
+  connect( mWebView, &QWebView::loadFinished, this, [ = ]( bool ) { resizeContent(); } );
 #endif
 
   mWebView->page()->settings()->setAttribute(
@@ -135,22 +136,29 @@ void QgsMapTip::showMapTip( QgsMapLayer *pLayer,
   mWidget->show();
 
 #if WITH_QTWEBKIT
+  resizeContent();
+#endif
+}
+
+void QgsMapTip::resizeContent()
+{
+  // Get the content size
+  QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
+                            QStringLiteral( "#QgsWebViewContainer" ) );
+  int width = container.geometry().width();
+  int height = container.geometry().height();
   int scrollbarWidth = mWebView->page()->mainFrame()->scrollBarGeometry(
                          Qt::Vertical ).width();
   int scrollbarHeight = mWebView->page()->mainFrame()->scrollBarGeometry(
                           Qt::Horizontal ).height();
 
   if ( scrollbarWidth > 0 || scrollbarHeight > 0 )
   {
-    // Get the content size
-    QWebElement container = mWebView->page()->mainFrame()->findFirstElement(
-                              QStringLiteral( "#QgsWebViewContainer" ) );
-    int width = container.geometry().width() + 5 + scrollbarWidth;
-    int height = container.geometry().height() + 5 + scrollbarHeight;
-
-    mWidget->resize( width, height );
+    width += 5 + scrollbarWidth;
+    height += 5 + scrollbarHeight;
   }
-#endif
+
+  mWidget->resize( width, height );
 }
 
 void QgsMapTip::clear( QgsMapCanvas * )
diff --git a/src/gui/qgsmaptip.h b/src/gui/qgsmaptip.h
@@ -96,5 +96,6 @@ class GUI_EXPORT QgsMapTip : public QWidget
 
   private slots:
     void onLinkClicked( const QUrl &url );
+    void resizeContent();
 };
 #endif // QGSMAPTIP_H

Original file line number	Diff line number	Diff line change
`@@ -9336,7 +9336,6 @@ void QgisApp::saveLastMousePosition( const QgsPointXY &p )`
`9336`	`9336`	`mpMaptip->clear( mMapCanvas );`
`9337`	`9337`	`// don't start the timer if the mouse is not over the map canvas`
`9338`	`9338`	`mpMapTipsTimer->start();`
`9339`		`- //QgsDebugMsg("Started maptips timer");`
`9340`	`9339`	`}`
`9341`	`9340`	`}`
`9342`	`9341`	`}`