Uncommited changes synced

[gitlive] / NewBranch.vala

diff --git a/NewBranch.vala b/NewBranch.vala
index cce2256..00dd30a 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -127,15 +127,15 @@ public class NewBranch : Object
          _this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
         
        _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid);
-       _this.scrolled_window.el.hide();
+    
        if (tid != "") {
                var name = RooTicket.singleton().usernameLocal();
                var ticket = RooTicket.singleton().getById(tid);
                _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
-               _this.scrolled_window.el.show();
-               _this.view.loadTicket(tid);
-       }
     
+    
+       }
+        _this.view.loadTicket(tid);
        this.el.run();
     
     }
@@ -483,6 +483,8 @@ public class NewBranch : Object
                var ticket = RooTicket.singleton().getById(ticket_id);
                
                _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName()));
+               _this.scrolled_window.el.show();
+                
                _this.view.loadTicket(ticket.id);
                //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2);
             });
@@ -857,6 +859,7 @@ public class NewBranch : Object
             // my vars (dec)
 
             // set gobject values
+            this.el.height_request = 500;
             this.el.vexpand = true;
             var child_0 = new Xcls_view( _this );
             child_0.ref();
@@ -893,6 +896,11 @@ public class NewBranch : Object
 
         // user defined functions
         public void loadTicket (string tid) {
+               if (tid == "") {
+                       _this.scrolled_window.el.hide();
+               } else {
+                       _this.scrolled_window.el.show();
+               }
                 this.el.load_uri("http://www.google.com");
         }
     }