DATabButton : deal with null check and fix bug the range page isn't disapper when...

Change-Id: I916a62d07b25a762de8d4acefb064fe92eb23b9b
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
index cc8bf6a..d8e89f6 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
@@ -114,7 +114,7 @@ public class DATabButton extends DACustomButton {
                                if (closeButtonRect.contains(event.x, event.y)) {
                                        button.setCloseButtonState(STATE_HOVER);
                                        if (null != closeButtonListener && !isAnimating) {
-                                               closeButtonListener.handleClickEvent(null);
+                                               closeButtonListener.handleClickEvent(button);
                                        }
                                } else {
                                        button.setCloseButtonState(STATE_NORMAL);

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
index 64272a4..c22e879 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
@@ -432,6 +432,7 @@ public class DATabComposite extends DABaseComposite {
                                                                if (data.width <= 0) {
                                                                        button.setAnimating(false);
                                                                        cancel();
+                                                                       changeLastTabPage();
                                                                }
                                                        }
                                                } else {
@@ -440,6 +441,7 @@ public class DATabComposite extends DABaseComposite {
                                        }
                                });
                        }
+                       
                }, 10, 50);
        }
 
@@ -447,6 +449,7 @@ public class DATabComposite extends DABaseComposite {
                DABaseComposite child = getView(ID);
                int index = children.indexOf(child);
                children.remove(index);
+               contentsComposite.layout();
                tabComposite.layout();
 
                final DATabButton button = buttons.remove(index);
@@ -465,8 +468,6 @@ public class DATabComposite extends DABaseComposite {
                        contentsStackLayout.topControl = lasttab;
                        contentsComposite.layout();
                }
-               
-               tabComposite.layout();
        }
        
        /**
@@ -517,6 +518,15 @@ public class DATabComposite extends DABaseComposite {
                contentsComposite.layout();
        }
        
+       public void changeLastTabPage() {
+               DATabButton lastTab = buttons.get(children.size()-1);
+               changeButtonState(lastTab);
+               DABaseComposite last = children.get(children.size()-1);
+               contentsStackLayout.topControl = last;
+               last.updateView();
+               contentsComposite.layout();
+       }
+       
        @Override
        public void clear() {
                int size = children.size();