MergeBranch.bjs

[gitlive] / Clones.vala

diff --git a/Clones.vala b/Clones.vala
index a9a7412..123d5ae 100644 (file)
--- a/Clones.vala
+++ b/Clones.vala
@@ -72,10 +72,10 @@ public class Clones : Object
     public void loadAndShow () {
        this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move((Gdk.Screen.width() / 2 ) - (int.max(1280,Gdk.Screen.width() / 2) ,0);
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.min(1280,Gdk.Screen.width()) / 2) ,0);
          this.el.set_keep_above(true);
         this.el.set_default_size(
-                       int.max(1280,Gdk.Screen.width()),
+                       int.min(1280,Gdk.Screen.width()),
                        int.max(500,Gdk.Screen.height() - 200)
        );
        this.el.show_all();
@@ -95,7 +95,7 @@ public class Clones : Object
     public void show ()    {
     this.el.set_deletable(true);
         this.el.set_gravity(Gdk.Gravity.NORTH);
-        this.el.move((Gdk.Screen.width() / 2 ) - (int.max(1280,Gdk.Screen.width() / 2) ,0);
+        this.el.move((Gdk.Screen.width() / 2 ) - (int.max(1280,Gdk.Screen.width()) / 2) ,0);
          this.el.set_keep_above(true);
        this.el.set_default_size(
                        int.max(1280,Gdk.Screen.width()),
@@ -349,7 +349,7 @@ public class Clones : Object
             //listeners
             this.el.row_activated.connect( (path, col)  =>  {
             
-               if (col.title != "Current Branch") {
+               if (col.title == "Auto Commit" || col.title == "Auto Push" || col.title == "Auto Branch") {
                        return;
                }