Merge remote-tracking branch 'upstream/master' into pair_symbols_tool

1 files changed, 24 insertions, 19 deletions

diff --git a/scene/gui/progress_bar.h b/scene/gui/progress_bar.h
index fa334a2ad9..fd34c67fae 100644
--- a/scene/gui/progress_bar.h
+++ b/scene/gui/progress_bar.h
@@ -26,22 +26,27 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#ifndef PROGRESS_BAR_H

-#define PROGRESS_BAR_H

-

-#include "scene/gui/range.h"

-

-class ProgressBar : public Range {

-

-	OBJ_TYPE( ProgressBar, Range );

-

-protected:

-

-	void _notification(int p_what);

-public:

-

-	Size2 get_minimum_size() const;

-	ProgressBar();

-};

-

-#endif // PROGRESS_BAR_H

+#ifndef PROGRESS_BAR_H
+#define PROGRESS_BAR_H
+
+#include "scene/gui/range.h"
+
+class ProgressBar : public Range {
+
+	OBJ_TYPE( ProgressBar, Range );
+
+	bool percent_visible;
+protected:
+
+	void _notification(int p_what);
+	static void _bind_methods();
+public:
+
+	void set_percent_visible(bool p_visible);
+	bool is_percent_visible() const;
+
+	Size2 get_minimum_size() const;
+	ProgressBar();
+};
+
+#endif // PROGRESS_BAR_H