DanmakusRetainer: adjust RLDanmakusRetainer

ctiao · Sep 8, 2015 · 155cd5d · 155cd5d
1 parent 6e125ae
commit 155cd5d
Showing 1 changed file with 12 additions and 15 deletions.
diff --git a/...eMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakusRetainer.java b/...eMaster/src/main/java/master/flame/danmaku/danmaku/renderer/android/DanmakusRetainer.java
@@ -123,7 +123,7 @@ public void fix(BaseDanmaku drawItem, IDisplayer disp) {
                         shown = true;
                         break;
                     }
-                    
+
                     if (firstItem == null)
                         firstItem = item;
 
@@ -151,7 +151,7 @@ public void fix(BaseDanmaku drawItem, IDisplayer disp) {
                     lastItem = item;
 
                 }
-
+                boolean checkEdge = true;
                 if (insertItem != null) {
                     if (lastItem != null)
                         topPos = lastItem.getBottom();
@@ -161,14 +161,10 @@ public void fix(BaseDanmaku drawItem, IDisplayer disp) {
                         mVisibleDanmakus.removeItem(insertItem);
                         shown = false;
                     }
-                } else if (overwriteInsert) {
-                    if (minRightRow != null) {
-                        topPos = minRightRow.getTop();
-                        if(minRightRow.paintWidth<drawItem.paintWidth){
-                            mVisibleDanmakus.removeItem(minRightRow);
-                            shown = false;
-                        }
-                    }
+                } else if (overwriteInsert && minRightRow != null) {
+                    topPos = minRightRow.getTop();
+                    checkEdge = false;
+                    shown = false;
                 } else if (lastItem != null) {
                     topPos = lastItem.getBottom();
                 } else if (firstItem != null) {
@@ -178,9 +174,10 @@ public void fix(BaseDanmaku drawItem, IDisplayer disp) {
                 } else {
                     topPos = 0;
                 }
-
-                topPos = checkVerticalEdge(overwriteInsert, drawItem, disp, topPos, firstItem,
-                        lastItem);
+                if (checkEdge) {
+                    topPos = checkVerticalEdge(overwriteInsert, drawItem, disp, topPos, firstItem,
+                            lastItem);
+                }
                 if (topPos == 0 && mVisibleDanmakus.size()==0) {
                     shown = false;
                 }
@@ -195,8 +192,8 @@ public void fix(BaseDanmaku drawItem, IDisplayer disp) {
         }
 
         protected float checkVerticalEdge(boolean overwriteInsert, BaseDanmaku drawItem,
-                IDisplayer disp, float topPos, BaseDanmaku firstItem, BaseDanmaku lastItem) {
-            if (topPos < 0 || (firstItem!=null && firstItem.getTop() > 0) || topPos + drawItem.paintHeight > disp.getHeight()) {
+                                          IDisplayer disp, float topPos, BaseDanmaku firstItem, BaseDanmaku lastItem) {
+            if (topPos < 0 || (firstItem != null && firstItem.getTop() > 0) || topPos + drawItem.paintHeight > disp.getHeight()) {
                 topPos = 0;
                 clear();
             }