From 4b7443aeea13bd007329adba418e60e36dead2ec Mon Sep 17 00:00:00 2001
From: Zher Huei Lee <lee.zh.92@gmail.com>
Date: Sat, 19 Nov 2016 21:48:39 +0800
Subject: Flat button support in ButtonArray. Fixes #7153

---
 scene/gui/button_array.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scene/gui/button_array.h')

diff --git a/scene/gui/button_array.h b/scene/gui/button_array.h
index 62997a8e36..81be3e41c3 100644
--- a/scene/gui/button_array.h
+++ b/scene/gui/button_array.h
@@ -59,6 +59,7 @@ private:
 
 	int selected;
 	int hover;
+	bool flat;
 	double min_button_size;
 
 	Vector<Button> buttons;
@@ -79,6 +80,9 @@ public:
 	void set_align(Align p_align);
 	Align get_align() const;
 
+	void set_flat(bool p_flat);
+	bool is_flat() const;
+
 	void add_button(const String& p_button,const String& p_tooltip="");
 	void add_icon_button(const Ref<Texture>& p_icon,const String& p_button="",const String& p_tooltip="");
 
-- 
cgit v1.2.3


From c7bc44d5ad9aae4902280012f7654e2318cd910e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Sun, 1 Jan 2017 22:01:57 +0100
Subject: Welcome in 2017, dear changelog reader!

That year should bring the long-awaited OpenGL ES 3.0 compatible renderer
with state-of-the-art rendering techniques tuned to work as low as middle
end handheld devices - without compromising with the possibilities given
for higher end desktop games of course. Great times ahead for the Godot
community and the gamers that will play our games!
---
 scene/gui/button_array.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scene/gui/button_array.h')

diff --git a/scene/gui/button_array.h b/scene/gui/button_array.h
index 81be3e41c3..7bd8929192 100644
--- a/scene/gui/button_array.h
+++ b/scene/gui/button_array.h
@@ -5,7 +5,7 @@
 /*                           GODOT ENGINE                                */
 /*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
 /*                                                                       */
 /* Permission is hereby granted, free of charge, to any person obtaining */
 /* a copy of this software and associated documentation files (the       */
-- 
cgit v1.2.3