Fix some 3d symbol layout issues

qgis · Jul 29, 2020 · 971a92d · 971a92d
1 parent b1d0261
commit 971a92d
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 41 deletions.
diff --git a/src/app/3d/qgssymbol3dwidget.cpp b/src/app/3d/qgssymbol3dwidget.cpp
@@ -47,7 +47,7 @@ QgsSymbol3DWidget::QgsSymbol3DWidget( QgsVectorLayer *layer, QWidget *parent )
   connect( mStyleWidget, &QgsStyleItemsListWidget::selectionChanged, this, &QgsSymbol3DWidget::setSymbolFromStyle );
   connect( mStyleWidget, &QgsStyleItemsListWidget::saveEntity, this, &QgsSymbol3DWidget::saveSymbol );
 
-  layout->addWidget( mStyleWidget );
+  layout->addWidget( mStyleWidget, 1 );
 }
 
 std::unique_ptr<QgsAbstract3DSymbol> QgsSymbol3DWidget::symbol()

diff --git a/src/gui/qgs3dsymbolwidget.cpp b/src/gui/qgs3dsymbolwidget.cpp
@@ -44,6 +44,7 @@ Qgs3DSymbolDialog::Qgs3DSymbolDialog( const QgsAbstract3DSymbol *symbol, QWidget
   mButtonBox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Ok, Qt::Horizontal );
   connect( mButtonBox, &QDialogButtonBox::accepted, this, &QDialog::accept );
   connect( mButtonBox, &QDialogButtonBox::rejected, this, &QDialog::reject );
+  vLayout->addStretch();
   vLayout->addWidget( mButtonBox );
   setLayout( vLayout );
   setWindowTitle( tr( "3D Symbol" ) );

diff --git a/src/ui/3d/line3dsymbolwidget.ui b/src/ui/3d/line3dsymbolwidget.ui
@@ -142,19 +142,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/ui/3d/phongmaterialwidget.ui b/src/ui/3d/phongmaterialwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>394</width>
-    <height>248</height>
+    <height>232</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/src/ui/3d/point3dsymbolwidget.ui b/src/ui/3d/point3dsymbolwidget.ui
@@ -401,19 +401,6 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/ui/3d/polygon3dsymbolwidget.ui b/src/ui/3d/polygon3dsymbolwidget.ui
@@ -240,19 +240,6 @@
      </property>
     </widget>
    </item>
-   <item row="11" column="0" colspan="3">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item row="5" column="0">
     <widget class="QLabel" name="label_8">
      <property name="text">