FormSpec: 9-slice images, animated_images, and fgimg_middle (#12453)

* FormSpec: 9-slice images and animated_images

* Add fgimg_middle; clean up code

* Address issues, add tests

* Fix stupid error; bump formspec version

* Re-add image[] elements without a size

1 files changed, 11 insertions, 16 deletions

diff --git a/src/gui/guiButtonImage.cpp b/src/gui/guiButtonImage.cpp
index b507ffece..4ab770a99 100644
--- a/src/gui/guiButtonImage.cpp
+++ b/src/gui/guiButtonImage.cpp
@@ -32,15 +32,15 @@ using namespace gui;
 GUIButtonImage::GUIButtonImage(gui::IGUIEnvironment *environment,
 		gui::IGUIElement *parent, s32 id, core::rect<s32> rectangle,
 		ISimpleTextureSource *tsrc, bool noclip)
-	: GUIButton (environment, parent, id, rectangle, tsrc, noclip)
+	: GUIButton(environment, parent, id, rectangle, tsrc, noclip)
 {
-	m_image = Environment->addImage(
-			core::rect<s32>(0,0,rectangle.getWidth(),rectangle.getHeight()), this);
-	m_image->setScaleImage(isScalingImage());
+	GUIButton::setScaleImage(true);
+	m_image = new GUIAnimatedImage(environment, this, id, rectangle);
 	sendToBack(m_image);
 }
 
-void GUIButtonImage::setForegroundImage(video::ITexture *image)
+void GUIButtonImage::setForegroundImage(video::ITexture *image,
+		const core::rect<s32> &middle)
 {
 	if (image == m_foreground_image)
 		return;
@@ -52,11 +52,12 @@ void GUIButtonImage::setForegroundImage(video::ITexture *image)
 		m_foreground_image->drop();
 
 	m_foreground_image = image;
-	m_image->setImage(image);
+	m_image->setTexture(image);
+	m_image->setMiddleRect(middle);
 }
 
 //! Set element properties from a StyleSpec
-void GUIButtonImage::setFromStyle(const StyleSpec& style)
+void GUIButtonImage::setFromStyle(const StyleSpec &style)
 {
 	GUIButton::setFromStyle(style);
 
@@ -67,19 +68,13 @@ void GUIButtonImage::setFromStyle(const StyleSpec& style)
 				getTextureSource());
 
 		setForegroundImage(guiScalingImageButton(driver, texture,
-			AbsoluteRect.getWidth(), AbsoluteRect.getHeight()));
-		setScaleImage(true);
+				AbsoluteRect.getWidth(), AbsoluteRect.getHeight()),
+				style.getRect(StyleSpec::FGIMG_MIDDLE, m_image->getMiddleRect()));
 	} else {
-		setForegroundImage(nullptr);
+		setForegroundImage();
 	}
 }
 
-void GUIButtonImage::setScaleImage(bool scaleImage)
-{
-	GUIButton::setScaleImage(scaleImage);
-	m_image->setScaleImage(scaleImage);
-}
-
 GUIButtonImage *GUIButtonImage::addButton(IGUIEnvironment *environment,
 		const core::rect<s32> &rectangle, ISimpleTextureSource *tsrc,
 		IGUIElement *parent, s32 id, const wchar_t *text,