commit 0edf18c26ccd24399e8cb5e915550b341cf56287
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Sep 23 17:35:50 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Sep 23 17:35:50 2013 -0400
tree 8ec3eacf0de78361d4d3ca148ddb409b6c976df4
parent 0a300ffae3ee3834c401ac190ad335ad80c61045

* #30525: removed hangup and transfer icon
* replaced with hangup fling

src/com/savoirfairelinux/sflphone/model/Bubble.java

diff --git a/src/com/savoirfairelinux/sflphone/model/Bubble.java b/src/com/savoirfairelinux/sflphone/model/Bubble.java
index f71a385..843fe50 100644
--- a/src/com/savoirfairelinux/sflphone/model/Bubble.java
+++ b/src/com/savoirfairelinux/sflphone/model/Bubble.java
@@ -32,6 +32,8 @@
     public PointF attractor = null;
 
     public boolean dragged = false;
+    
+    public boolean markedToDie = false;
     public long last_drag;
     public boolean expanded; // determine if we draw the buttons around the bubble
     private Bitmap saved_photo;
@@ -181,7 +183,7 @@
         fatality.setStyle(Paint.Style.FILL);
 
         canvasf.drawOval(new RectF(0, 0, getRadius() * 2, getRadius() * 2), mPaintPath); // background with buttons
-        
+
         int[] allpixels = new int[internalBMP.getHeight() * internalBMP.getWidth()];
 
         internalBMP.getPixels(allpixels, 0, internalBMP.getWidth(), 0, 0, internalBMP.getWidth(), internalBMP.getHeight());
@@ -192,7 +194,7 @@
             }
         }
         internalBMP.setPixels(allpixels, 0, internalBMP.getWidth(), 0, 0, internalBMP.getWidth(), internalBMP.getHeight());
-        
+
         canvasf.drawBitmap(internalBMP, (float) (getRadius() - radius), (float) (getRadius() - radius), fatality);
 
     }
@@ -272,6 +274,10 @@
         return 0;
     }
 
+    public boolean isOnBorder(float w, float h) {
+        return (bounds.left < 0 || bounds.right > w || bounds.top < 0 || bounds.bottom > h);
+    }
+
     /**
      * Always return the normal radius of the bubble
      *