[SRADA-728] Resolve issue that scrollbar doesn't appear at Windows env.
authorjaeyong lee <jae-yong.lee@samsung.com>
Wed, 1 Jun 2016 05:39:40 +0000 (14:39 +0900)
committerjaeyong lee <jae-yong.lee@samsung.com>
Thu, 2 Jun 2016 03:11:36 +0000 (12:11 +0900)
Change-Id: I80fff6281a5446521c534497c74765494f71d818

org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/chartBoard/DAChartBoard.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java

index a2c5778..2c3b003 100644 (file)
@@ -55,6 +55,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.ScrollBar;
+import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton;
@@ -102,7 +103,7 @@ public class DAChartBoard extends Composite {
        private final static int DEFAULT_CHARTBOARD_HEADER_HEIGHT = 25; //[UX]04 feature list/chart area
        private final static int DEFAULT_CHARTBOARD_TITLE_BUTTON_WIDTH = 118;
        private final static int DEFAULT_CHARTBOARD_MINIMIZE_BUTTON_WIDTH = 22;
-       private final static int DEFAULT_CHARTBOARD_FOOTER_HEIGHT = 31;
+       private final static int DEFAULT_CHARTBOARD_FOOTER_HEIGHT = 18;
        private final static int DEFAULT_CHARTBOARD_SCALE_WIDTH = 192; //[UX]04 feature list/chart area
 
        public static final double ITEM_HEIGHT_RATIO_SHORT = 0.5;
@@ -343,28 +344,52 @@ public class DAChartBoard extends Composite {
                        lifecycleBar.setLayoutData(data);
                }
 
-               data = new FormData();
-               data.left = new FormAttachment(0, 0);
-               data.top = new FormAttachment(titleComp, 0);
-               data.bottom = new FormAttachment(100, -15); //[UX] 04 feature list/chart area
-               data.right = new FormAttachment(100, 0);
-               itemListScrollComp.setLayoutData(data);
+               
+               if (CommonUtil.isWin()) {
+                       data = new FormData();
+                       data.left = new FormAttachment(0, 0);
+                       data.top = new FormAttachment(titleComp, 0);
+                       data.bottom = new FormAttachment(100, DEFAULT_CHARTBOARD_FOOTER_HEIGHT * -1);
+                       data.right = new FormAttachment(100, 0);
+                       itemListScrollComp.setLayoutData(data);
 
-               data = new FormData();
-               data.left = new FormAttachment(0, 0);
-               data.top = new FormAttachment(itemListScrollComp, 0);
-               data.bottom = new FormAttachment(100, 0);
-               data.width = DEFAULT_CHARTBOARD_SCALE_WIDTH;
-//             data.height = DEFAULT_CHARTBOARD_FOOTER_HEIGHT;
-               scale.setLayoutData(data);
+                       data = new FormData();
+                       data.left = new FormAttachment(0, 0);
+                       data.top = new FormAttachment(itemListScrollComp, 0);
+                       data.bottom = new FormAttachment(100, 0);
+                       data.width = DEFAULT_CHARTBOARD_SCALE_WIDTH;
+                       data.height = DEFAULT_CHARTBOARD_FOOTER_HEIGHT;
+                       scale.setLayoutData(data);
 
-               data = new FormData();
-               data.left = new FormAttachment(scale, 0);
-               data.right = new FormAttachment(100, 0);
-               data.top = new FormAttachment(itemListScrollComp, 0);
-               data.bottom = new FormAttachment(100, 0);
-//             data.height = DEFAULT_CHARTBOARD_FOOTER_HEIGHT;
-               scrollComp.setLayoutData(data);
+                       data = new FormData();
+                       data.left = new FormAttachment(scale, 0);
+                       data.right = new FormAttachment(100, 0);
+                       data.top = new FormAttachment(itemListScrollComp, 0);
+                       data.bottom = new FormAttachment(100, 0);
+                       data.height = DEFAULT_CHARTBOARD_FOOTER_HEIGHT;
+                       scrollComp.setLayoutData(data);
+               } else {
+                       data = new FormData();
+                       data.left = new FormAttachment(0, 0);
+                       data.top = new FormAttachment(titleComp, 0);
+                       data.bottom = new FormAttachment(100, -15);
+                       data.right = new FormAttachment(100, 0);
+                       itemListScrollComp.setLayoutData(data);
+
+                       data = new FormData();
+                       data.left = new FormAttachment(0, 0);
+                       data.top = new FormAttachment(itemListScrollComp, 0);
+                       data.bottom = new FormAttachment(100, 0);
+                       data.width = DEFAULT_CHARTBOARD_SCALE_WIDTH;
+                       scale.setLayoutData(data);
+
+                       data = new FormData();
+                       data.left = new FormAttachment(scale, 0);
+                       data.right = new FormAttachment(100, 0);
+                       data.top = new FormAttachment(itemListScrollComp, 0);
+                       data.bottom = new FormAttachment(100, 0);
+                       scrollComp.setLayoutData(data);
+               }
 
                itemListScrollComp.layout();
                boardManager = new DAChartBoardManager(this);
index a01f017..1b53f91 100644 (file)
@@ -75,7 +75,7 @@ public class BaseView extends ViewPart {
        DATabComposite tabView = null;
        
        private static final int MINIMUM_SHELL_WIDTH = 800;
-       private static final int MINIMUM_SHELL_HEIGHT_WIN = 651;
+       private static final int MINIMUM_SHELL_HEIGHT_WIN = 657;
        private static final int MINIMUM_SHELL_HEIGHT_LINUX = 622;
 
        @Override