From 58bd2b130f0b054e318aab2133042cd7f86d1198 Mon Sep 17 00:00:00 2001
From: jules <jules@juce.com>
Date: Tue, 8 Nov 2016 17:36:24 +0000
Subject: [PATCH] Added a few extra FlexItem convenience methods

---
 modules/juce_gui_basics/layout/juce_FlexBox.cpp | 13 ++++++++++---
 modules/juce_gui_basics/layout/juce_FlexItem.h  | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/modules/juce_gui_basics/layout/juce_FlexBox.cpp b/modules/juce_gui_basics/layout/juce_FlexBox.cpp
index 6d53a1832d..44095f8ffe 100644
--- a/modules/juce_gui_basics/layout/juce_FlexBox.cpp
+++ b/modules/juce_gui_basics/layout/juce_FlexBox.cpp
@@ -831,6 +831,13 @@ FlexItem FlexItem::withFlex (float newFlexGrow, float newFlexShrink, float newFl
     return fi;
 }
 
-FlexItem FlexItem::withWidth (float newWidth) const noexcept    { auto fi = *this; fi.width = newWidth; return fi; }
-FlexItem FlexItem::withHeight (float newHeight) const noexcept  { auto fi = *this; fi.height = newHeight; return fi; }
-FlexItem FlexItem::withMargin (Margin m) const noexcept         { auto fi = *this; fi.margin = m; return fi; }
+FlexItem FlexItem::withWidth (float newWidth) const noexcept         { auto fi = *this; fi.width = newWidth; return fi; }
+FlexItem FlexItem::withMinWidth (float newMinWidth) const noexcept   { auto fi = *this; fi.minWidth = newMinWidth; return fi; }
+FlexItem FlexItem::withMaxWidth (float newMaxWidth) const noexcept   { auto fi = *this; fi.maxWidth = newMaxWidth; return fi; }
+
+FlexItem FlexItem::withMinHeight (float newMinHeight) const noexcept { auto fi = *this; fi.minHeight = newMinHeight; return fi; };
+FlexItem FlexItem::withMaxHeight (float newMaxHeight) const noexcept { auto fi = *this; fi.maxHeight = newMaxHeight; return fi; };
+FlexItem FlexItem::withHeight (float newHeight) const noexcept       { auto fi = *this; fi.height = newHeight; return fi; }
+
+FlexItem FlexItem::withMargin (Margin m) const noexcept              { auto fi = *this; fi.margin = m; return fi; }
+FlexItem FlexItem::withOrder (int newOrder) const noexcept           { auto fi = *this; fi.order = newOrder; return fi; }
\ No newline at end of file
diff --git a/modules/juce_gui_basics/layout/juce_FlexItem.h b/modules/juce_gui_basics/layout/juce_FlexItem.h
index 8390310558..22cd00d551 100644
--- a/modules/juce_gui_basics/layout/juce_FlexItem.h
+++ b/modules/juce_gui_basics/layout/juce_FlexItem.h
@@ -134,9 +134,24 @@ public:
     /** Returns a copy of this object with a new width. */
     FlexItem withWidth (float newWidth) const noexcept;
 
+    /** Returns a copy of this object with a new minimum width. */
+    FlexItem withMinWidth (float newMinWidth) const noexcept;
+
+    /** Returns a copy of this object with a new maximum width. */
+    FlexItem withMaxWidth (float newMaxWidth) const noexcept;
+
     /** Returns a copy of this object with a new height. */
     FlexItem withHeight (float newHeight) const noexcept;
 
+    /** Returns a copy of this object with a new minimum height. */
+    FlexItem withMinHeight (float newMinHeight) const noexcept;
+
+    /** Returns a copy of this object with a new maximum height. */
+    FlexItem withMaxHeight (float newMaxHeight) const noexcept;
+
     /** Returns a copy of this object with a new margin. */
     FlexItem withMargin (Margin) const noexcept;
+
+    /** Returns a copy of this object with a new order. */
+    FlexItem withOrder (int newOrder) const noexcept;
 };