From 0d3ebf10a8e97f576f0123951a60873008dc6549 Mon Sep 17 00:00:00 2001
From: David Vierra <codewarrior@hawaii.rr.com>
Date: Mon, 8 Feb 2016 17:15:51 -1000
Subject: [PATCH] Brush tool option layout has better flow now

---
 src/mcedit2/editortools/brush/modes.py |  6 ++----
 src/mcedit2/ui/editortools/brush.ui    | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/mcedit2/editortools/brush/modes.py b/src/mcedit2/editortools/brush/modes.py
index b6f2da5..474bdbf 100644
--- a/src/mcedit2/editortools/brush/modes.py
+++ b/src/mcedit2/editortools/brush/modes.py
@@ -88,9 +88,7 @@ class Fill(BrushMode):
         self.blockTypeButton.block = brushTool.editorSession.worldEditor.blocktypes['minecraft:stone']
         self.blockTypeButton.blocksChanged.connect(brushTool.updateCursor)
 
-        self.optionsWidget.setLayout(Column(
-            Row(label, self.blockTypeButton, margin=0),
-            None, margin=0))
+        self.optionsWidget.setLayout(Row(label, self.blockTypeButton, margin=0))
 
     def getOptions(self):
         return {'blockInfo': self.blockTypeButton.block}
@@ -138,7 +136,7 @@ class Biome(BrushMode):
             self.biomeTypeBox.addItem(biome.name, biome.ID)
 
         self.biomeTypeBox.activated.connect(brushTool.updateCursor)
-        self.optionsWidget.setLayout(Column(Row(label, self.biomeTypeBox, margin=0), None, margin=0))
+        self.optionsWidget.setLayout(Row(label, self.biomeTypeBox, margin=0))
 
     def getOptions(self):
         return {'biomeID': self.biomeTypeBox.itemData(self.biomeTypeBox.currentIndex())}
diff --git a/src/mcedit2/ui/editortools/brush.ui b/src/mcedit2/ui/editortools/brush.ui
index bb04cb4..772753c 100644
--- a/src/mcedit2/ui/editortools/brush.ui
+++ b/src/mcedit2/ui/editortools/brush.ui
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
    <item>
     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,0,0,0">
      <item row="6" column="1" colspan="2">
@@ -135,6 +135,22 @@
      </property>
     </widget>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::MinimumExpanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>