From 34962d23c444b0aae132e4cbb81ec4d8cac486f6 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 17 Dec 2018 10:02:27 +0800
Subject: [PATCH] RepoStatusPopover.bjs RepoStatusPopover.vala

---
 RepoStatusPopover.bjs  | 16 ++++++++--------
 RepoStatusPopover.vala |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index 9cc00e91..5952a648 100644
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -31,15 +31,15 @@
        "items" : [
         {
          "id" : "label_status",
-         "xtype" : "Label",
          "* pack" : false,
+         "xtype" : "Label",
          "$ xns" : "Gtk",
          "utf8 label" : "Status"
         },
         {
          "id" : "label_diff",
-         "* pack" : false,
          "xtype" : "Label",
+         "* pack" : false,
          "$ xns" : "Gtk",
          "utf8 label" : "Diff"
         },
@@ -75,8 +75,8 @@
          "items" : [
           {
            "int height_request" : 400,
-           "xtype" : "ScrolledWindow",
            "* pack" : "pack_start,true,true,0",
+           "xtype" : "ScrolledWindow",
            "$ xns" : "Gtk",
            "items" : [
             {
@@ -106,8 +106,8 @@
           "button_press_event" : "() => {\n  \n   \n   GitMonitor.gitmonitor.stop();\n   _this.repo.git({ \"stash\" , \"--all\" });\n   _this.repo.loadStatus();\n   GitMonitor.gitmonitor.start();\n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    Clones.singleton().reposStore.load();\n  \n   _this.el.hide();\n    return false;\n}"
          },
          "label" : "Stash Changes",
-         "* pack" : "add",
          "xtype" : "Button",
+         "* pack" : "add",
          "$ xns" : "Gtk"
         },
         {
@@ -115,17 +115,17 @@
           "button_press_event" : "() => {\n   _this.repo.git({ \"commit\" , \"-a\" ,\"-m\", \"Uncommited changes synced\" });\n   _this.repo.push();\n   _this.repo.loadStatus();\n   \n    _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);\n    _this.status_view.el.get_buffer().set_text(_this.repo.git_status);\n    \n   _this.el.hide();\n   Clones.singleton().reposStore.load();\n   \n    return false;\n}"
          },
          "label" : "Commit Changes",
-         "* pack" : "add",
          "xtype" : "Button",
+         "* pack" : "add",
          "$ xns" : "Gtk"
         },
         {
          "listeners" : {
-          "button_press_event" : "() => {\n   var oldq = new Gee.ArrayList<GitMonitorQueue>();  \n\t \n\tNewBranch.singleton().show(_this.repo, oldq);\n\n    return false;\n}"
+          "button_press_event" : "() => {\n   var oldq = new Gee.ArrayList<GitMonitorQueue>();  \n\t_this.el.hide();\n\tClones.singleton().el.hide();\n\tNewBranch.singleton().show(_this.repo, oldq);\n\n    return false;\n}"
          },
          "label" : "Create Branch",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         },
         {
@@ -133,8 +133,8 @@
           "button_press_event" : "() => {\n       _this.el.hide();\n        return false;\n}"
          },
          "label" : "Ignore for now",
-         "xtype" : "Button",
          "* pack" : "add",
+         "xtype" : "Button",
          "$ xns" : "Gtk"
         }
        ]
diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index 3fc1a6be..d9e384ea 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -466,7 +466,8 @@ public class RepoStatusPopover : Object
             //listeners
             this.el.button_press_event.connect( () => {
                var oldq = new Gee.ArrayList<GitMonitorQueue>();  
-            	 
+            	_this.el.hide();
+            	Clones.singleton().el.hide();
             	NewBranch.singleton().show(_this.repo, oldq);
             
                 return false;
-- 
2.39.2