Use a vertical layout for property assistant when in dock mode

qgis · Feb 14, 2017 · 7bf97be · 7bf97be
1 parent 76e2781
commit 7bf97be
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/src/gui/qgspropertyassistantwidget.cpp b/src/gui/qgspropertyassistantwidget.cpp
@@ -64,6 +64,10 @@ QgsPropertyAssistantWidget::QgsPropertyAssistantWidget( QWidget* parent ,
   mLegendPreview->setItemDelegate( new ItemDelegate( &mPreviewList ) );
   mLegendPreview->setHeaderHidden( true );
   mLegendPreview->expandAll();
+  mLegendVerticalFrame->setLayout( new QVBoxLayout() );
+  mLegendVerticalFrame->layout()->setContentsMargins( 0, 0, 0, 0 );
+  mLegendVerticalFrame->layout()->setMargin( 0 );
+  mLegendVerticalFrame->hide();
 
   switch ( definition.standardTemplate() )
   {
@@ -116,6 +120,17 @@ void QgsPropertyAssistantWidget::updateProperty( QgsProperty& property )
     property.setTransformer( mTransformerWidget->createTransformer( minValueSpinBox->value(), maxValueSpinBox->value() ) );
 }
 
+void QgsPropertyAssistantWidget::setDockMode( bool dockMode )
+{
+  QgsPanelWidget::setDockMode( dockMode );
+
+  if ( dockMode && mLegendVerticalFrame->isHidden() )
+  {
+    mLegendVerticalFrame->layout()->addWidget( mLegendPreview );
+    mLegendVerticalFrame->show();
+  }
+}
+
 void QgsPropertyAssistantWidget::computeValuesFromLayer()
 {
   if ( !mLayer )

diff --git a/src/gui/qgspropertyassistantwidget.h b/src/gui/qgspropertyassistantwidget.h
@@ -107,6 +107,8 @@ class GUI_EXPORT QgsPropertyAssistantWidget : public QgsPanelWidget, private Ui:
 
     void setSymbol( std::shared_ptr< QgsSymbol > symbol ) { mSymbol = symbol; updatePreview(); }
 
+    void setDockMode( bool dockMode ) override;
+
   private slots:
     void computeValuesFromLayer();
     void updatePreview();

diff --git a/src/ui/qgspropertyassistantwidgetbase.ui b/src/ui/qgspropertyassistantwidgetbase.ui
@@ -10,7 +10,17 @@
     <height>332</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,1,0">
+  <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0">
+   <item row="0" column="1" rowspan="2">
+    <widget class="QTreeView" name="mLegendPreview">
+     <property name="minimumSize">
+      <size>
+       <width>200</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="0">
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
@@ -129,13 +139,13 @@
      </layout>
     </widget>
    </item>
-   <item row="0" column="1" rowspan="2">
-    <widget class="QTreeView" name="mLegendPreview">
-     <property name="minimumSize">
-      <size>
-       <width>200</width>
-       <height>0</height>
-      </size>
+   <item row="2" column="0">
+    <widget class="QFrame" name="mLegendVerticalFrame">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
      </property>
     </widget>
    </item>