From: Alan Knowles <alan@roojs.com>
Date: Mon, 18 May 2015 09:43:04 +0000 (+0800)
Subject: src/Builder4/MainWindow.bjs
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=32527f42ad050311434b359c516fb0e53156bfa1;p=app.Builder.js

src/Builder4/MainWindow.bjs
src/Builder4/MainWindow.vala
---

diff --git a/src/Builder4/MainWindow.bjs b/src/Builder4/MainWindow.bjs
index 0877e06c1..92392c05d 100644
--- a/src/Builder4/MainWindow.bjs
+++ b/src/Builder4/MainWindow.bjs
@@ -613,7 +613,7 @@
           },
           {
            "listeners" : {
-            "button_press_event" : "() => {\n    if (this.popup == null) {\n        this.popup = new Xcls_ValaCompileErrors();\n        this.popup.window = _this;\n    }\n    if (this.popup.active) {\n        this.popup.active = false;\n        this.popup.el.hide();\n        return true;\n    }\n    \n    this.popup.show(this.notices, this.el);\n    return true;\n}"
+            "button_press_event" : "() => {\n    if (this.popup == null) {\n        this.popup = new Xcls_ValaCompileErrors();\n        this.popup.window = _this;\n    }\n    if (_this.statusbar_warnings.popup != null && _this.statusbar_warnings.popup.active) {\n        _this.statusbar_warnings.popup.active = false;\n        _this.statusbar_warnings.popup.el.hide();\n    }\n    if (_this.statusbar_depricated.popup != null && _this.statusbar_depricated.popup.active) {\n        _this.statusbar_depricated.popup.active = false;\n        _this.statusbar_depricated.popup.el.hide();\n    }\n    \n    if (this.popup.active) {\n        this.popup.active = false;\n        this.popup.el.hide();\n        return true;\n    }\n    \n    this.popup.show(this.notices, this.el);\n    return true;\n}"
            },
            "bool always_show_image" : true,
            "id" : "statusbar_errors",
diff --git a/src/Builder4/MainWindow.vala b/src/Builder4/MainWindow.vala
index d4de9791c..fbf0af9fc 100644
--- a/src/Builder4/MainWindow.vala
+++ b/src/Builder4/MainWindow.vala
@@ -2314,6 +2314,15 @@ public class Xcls_MainWindow : Object
                     this.popup = new Xcls_ValaCompileErrors();
                     this.popup.window = _this;
                 }
+                if (_this.statusbar_warnings.popup != null && _this.statusbar_warnings.popup.active) {
+                    _this.statusbar_warnings.popup.active = false;
+                    _this.statusbar_warnings.popup.el.hide();
+                }
+                if (_this.statusbar_depricated.popup != null && _this.statusbar_depricated.popup.active) {
+                    _this.statusbar_depricated.popup.active = false;
+                    _this.statusbar_depricated.popup.el.hide();
+                }
+                
                 if (this.popup.active) {
                     this.popup.active = false;
                     this.popup.el.hide();