2 files changed, 90 insertions, 63 deletions
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp
index 09b960f345..73fa1fbb98 100644
--- a/scene/gui/progress_bar.cpp
+++ b/scene/gui/progress_bar.cpp
@@ -26,47 +26,69 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#include "progress_bar.h"
-
-
-Size2 ProgressBar::get_minimum_size() const {
-
-	Ref<StyleBox> bg = get_stylebox("bg");
-	Ref<Font> font = get_font("font");
-
-	Size2 ms=bg->get_minimum_size()+bg->get_center_size();
-	ms.height=MAX(ms.height,bg->get_minimum_size().height+font->get_height());
-	return ms;
-}
-
-
-void ProgressBar::_notification(int p_what) {
-
-
-	if (p_what==NOTIFICATION_DRAW) {
-
-		Ref<StyleBox> bg = get_stylebox("bg");
-		Ref<StyleBox> fg = get_stylebox("fg");
-		Ref<Font> font = get_font("font");
-		Color font_color=get_color("font_color");
-		Color font_color_shadow=get_color("font_color_shadow");
-
-		draw_style_box(bg,Rect2(Point2(),get_size()));
-		float r = get_unit_value();
-		int mp = fg->get_minimum_size().width;
-		int p = r*get_size().width-mp;
-		if (p>0) {
-
-			draw_style_box(fg,Rect2(Point2(),Size2(p+fg->get_minimum_size().width,get_size().height)));
-		}
-
-		int fh=font->get_height();
-		String txt=itos(int(get_unit_value()*100))+"%";
-		font->draw_halign(get_canvas_item(),Point2(0,font->get_ascent()+(get_size().height-font->get_height())/2),HALIGN_CENTER,get_size().width,txt,font_color);
-	}
-}
-
-ProgressBar::ProgressBar() {
-
-	set_v_size_flags(0);
-}
+#include "progress_bar.h"
+
+
+Size2 ProgressBar::get_minimum_size() const {
+
+	Ref<StyleBox> bg = get_stylebox("bg");
+	Ref<Font> font = get_font("font");
+
+	Size2 ms=bg->get_minimum_size()+bg->get_center_size();
+	ms.height=MAX(ms.height,bg->get_minimum_size().height+font->get_height());
+	return ms;
+}
+
+
+void ProgressBar::_notification(int p_what) {
+
+
+	if (p_what==NOTIFICATION_DRAW) {
+
+		Ref<StyleBox> bg = get_stylebox("bg");
+		Ref<StyleBox> fg = get_stylebox("fg");
+		Ref<Font> font = get_font("font");
+		Color font_color=get_color("font_color");
+		Color font_color_shadow=get_color("font_color_shadow");
+
+		draw_style_box(bg,Rect2(Point2(),get_size()));
+		float r = get_unit_value();
+		int mp = fg->get_minimum_size().width;
+		int p = r*get_size().width-mp;
+		if (p>0) {
+
+			draw_style_box(fg,Rect2(Point2(),Size2(p+fg->get_minimum_size().width,get_size().height)));
+		}
+
+		if (percent_visible) {
+			int fh=font->get_height();
+			String txt=itos(int(get_unit_value()*100))+"%";
+			font->draw_halign(get_canvas_item(),Point2(0,font->get_ascent()+(get_size().height-font->get_height())/2),HALIGN_CENTER,get_size().width,txt,font_color);
+		}
+	}
+}
+
+
+void ProgressBar::set_percent_visible(bool p_visible) {
+
+	percent_visible=p_visible;
+	update();
+}
+
+bool ProgressBar::is_percent_visible() const{
+
+	return percent_visible;
+}
+
+void ProgressBar::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("set_percent_visible","visible"),&ProgressBar::set_percent_visible);
+	ObjectTypeDB::bind_method(_MD("is_percent_visible"),&ProgressBar::is_percent_visible);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL,"percent/visible"),_SCS("set_percent_visible"),_SCS("is_percent_visible"));
+}
+
+ProgressBar::ProgressBar() {
+
+	set_v_size_flags(0);
+	percent_visible=true;
+}
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