From 6388d1a657dd0f261412a55e4f92909ced684bdd Mon Sep 17 00:00:00 2001
From: Dario Manesku <dariomanesku@gmail.com>
Date: Mon, 11 Aug 2014 10:59:49 +0100
Subject: [PATCH] Added optional _r (corner radius) parameter for
 imguiBeginScrollArea().

---
 examples/common/imgui/imgui.cpp | 32 ++++++++++++++++++++++----------
 examples/common/imgui/imgui.h   |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
index da42c974..dbd37898 100644
--- a/examples/common/imgui/imgui.cpp
+++ b/examples/common/imgui/imgui.cpp
@@ -670,7 +670,7 @@ struct Imgui
 		nvgEndFrame(m_nvg);
 	}
 
-	bool beginScrollArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, int32_t* _scroll, bool _enabled)
+	bool beginScrollArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, int32_t* _scroll, int32_t _r, bool _enabled)
 	{
 		m_areaId++;
 		m_widgetId = 0;
@@ -681,13 +681,25 @@ struct Imgui
 			setEnabled(m_areaId);
 		}
 
-		drawRoundedRect( (float)_x
-					   , (float)_y
-					   , (float)_width
-					   , (float)_height
-					   , 6
-					   , imguiRGBA(0, 0, 0, 192)
-					   );
+		if (0 == _r)
+		{
+			drawRect( (float)_x
+				    , (float)_y
+				    , (float)_width
+				    , (float)_height + 0.3f /*border fix for seamlessly joining two scroll areas*/
+				    , imguiRGBA(0, 0, 0, 192)
+				    );
+		}
+		else
+		{
+			drawRoundedRect( (float)_x
+						   , (float)_y
+						   , (float)_width
+						   , (float)_height
+						   , (float)_r
+						   , imguiRGBA(0, 0, 0, 192)
+						   );
+		}
 
 		const bool hasTitle = (NULL != _name && '\0' != _name[0]);
 
@@ -2433,9 +2445,9 @@ bool imguiBorderButton(ImguiBorder::Enum _border, bool _checked, bool _enabled)
 	return s_imgui.borderButton(_border, _checked, _enabled);
 }
 
-bool imguiBeginScrollArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, int32_t* _scroll, bool _enabled)
+bool imguiBeginScrollArea(const char* _name, int32_t _x, int32_t _y, int32_t _width, int32_t _height, int32_t* _scroll, int32_t _r, bool _enabled)
 {
-	return s_imgui.beginScrollArea(_name, _x, _y, _width, _height, _scroll, _enabled);
+	return s_imgui.beginScrollArea(_name, _x, _y, _width, _height, _scroll, _r, _enabled);
 }
 
 void imguiEndScrollArea()
diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h
index cd66a2bd..1ff293e5 100644
--- a/examples/common/imgui/imgui.h
+++ b/examples/common/imgui/imgui.h
@@ -90,7 +90,7 @@ void imguiEndFrame();
 /// Notice: this function is not to be called between imguiBeginScrollArea() and imguiEndScrollArea().
 bool imguiBorderButton(ImguiBorder::Enum _border, bool _checked, bool _enabled = true);
 
-bool imguiBeginScrollArea(const char* _name, int _x, int _y, int _width, int _height, int* _scroll, bool _enabled = true);
+bool imguiBeginScrollArea(const char* _name, int _x, int _y, int _width, int _height, int* _scroll, int32_t _r = 6, bool _enabled = true);
 void imguiEndScrollArea();
 
 void imguiIndent(uint16_t _width = 16);