Fix initial positioning of floating widgets

qgis · Jan 16, 2018 · 05c7132 · 05c7132
1 parent df90fef
commit 05c7132
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/python/gui/qgsfloatingwidget.sip b/python/gui/qgsfloatingwidget.sip
@@ -120,6 +120,8 @@ Emitted when the anchor widget point changes
 
     virtual void paintEvent( QPaintEvent *e );
 
+    virtual void resizeEvent( QResizeEvent *e );
+
 
 };
 

diff --git a/src/gui/qgsfloatingwidget.cpp b/src/gui/qgsfloatingwidget.cpp
@@ -85,8 +85,8 @@ void QgsFloatingWidget::setAnchorWidgetPoint( QgsFloatingWidget::AnchorPoint poi
 
 void QgsFloatingWidget::showEvent( QShowEvent *e )
 {
-  onAnchorPointChanged();
   QWidget::showEvent( e );
+  onAnchorPointChanged();
 }
 
 void QgsFloatingWidget::paintEvent( QPaintEvent *e )
@@ -98,6 +98,12 @@ void QgsFloatingWidget::paintEvent( QPaintEvent *e )
   style()->drawPrimitive( QStyle::PE_Widget, &opt, &p, this );
 }
 
+void QgsFloatingWidget::resizeEvent( QResizeEvent *e )
+{
+  QWidget::resizeEvent( e );
+  onAnchorPointChanged();
+}
+
 void QgsFloatingWidget::onAnchorPointChanged()
 {
   if ( !parentWidget() )

diff --git a/src/gui/qgsfloatingwidget.h b/src/gui/qgsfloatingwidget.h
@@ -120,6 +120,7 @@ class GUI_EXPORT QgsFloatingWidget: public QWidget
   protected:
     void showEvent( QShowEvent *e ) override;
     void paintEvent( QPaintEvent *e ) override;
+    void resizeEvent( QResizeEvent *e ) override;
 
   private slots: