Title Layout : UX/UI was modified

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

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
index 3c1a44d..01d5465 100755 (executable)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
@@ -73,6 +73,9 @@ public class ColorResources {
        public static Color EDIT_CHART_DIALOG_LOWER = getColor("edit_chart_dialog_lower");//$NON-NLS-1$\r
 \r
        public static Color VIEW_BORDER = getColor("view_border"); //$NON-NLS-1$\r
+       public static Color VIEW_BORDER_1 = getColor("view_border_1"); //$NON-NLS-1$\r
+       public static Color VIEW_BORDER_2 = getColor("view_border_2"); //$NON-NLS-1$\r
+       public static Color VIEW_BORDER_3 = getColor("view_border_3"); //$NON-NLS-1$\r
        public static Color VIEW_BG_COLOR = getColor("view_bg_color"); //$NON-NLS-1$\r
        public static Color VIEW_TITLE_FONT_COLOR = getColor("view_title_font_color");//$NON-NLS-1$\r
 \r

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
index 1cf46c3..db46618 100644 (file)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
@@ -78,8 +78,11 @@ public class DAThemeWhite extends DATheme {
                setColor("edit_chart_dialog_lower", new RGB(240, 240, 240));
 
                setColor("view_border", new RGB(206, 206, 206)); //$NON-NLS-1$
+               setColor("view_border_1", new RGB(160, 160, 160)); //$NON-NLS-1$
+               setColor("view_border_2", new RGB(232, 234, 235)); //$NON-NLS-1$
+               setColor("view_border_3", new RGB(186, 186, 186)); //$NON-NLS-1$
                setColor("view_bg_color", new RGB(230, 230, 230)); //$NON-NLS-1$
-               getColor("view_title_font_color", new RGB(0, 0, 0));
+               getColor("view_title_font_color", new RGB(255, 255, 255));
 
                setColor("coolbar_bg_color", new RGB(228, 228, 228)); //$NON-NLS-1$
                setColor("default_font_color", new RGB(0, 0, 0));//$NON-NLS-1$
@@ -87,8 +90,8 @@ public class DAThemeWhite extends DATheme {
                /** title bar colors **/
                setColor("titlebar_text_color", new RGB(64, 208, 255)); //$NON-NLS-1$
                setColor("titlebar_bg", new RGB(78, 79, 81)); //$NON-NLS-1$
-               setColor("titlebar_start_color", new RGB(240, 240, 240)); //$NON-NLS-1$
-               setColor("titlebar_end_color", new RGB(165, 165, 165)); //$NON-NLS-1$
+               setColor("titlebar_start_color", new RGB(104, 156, 166)); //$NON-NLS-1$
+               setColor("titlebar_end_color", new RGB(55, 105, 114)); //$NON-NLS-1$
                setColor("titlebar_bottom_stroke_1", new RGB(115, 115, 115));
                setColor("titlebar_bottom_stroke_2", new RGB(160, 160, 160));
 

diff --git a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
index 1eebfe1..62bb73e 100755 (executable)
--- a/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
+++ b/org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DAViewComposite.java
@@ -41,44 +41,66 @@ public abstract class DAViewComposite extends DABaseComposite {
                final Composite composite = new Composite(this, SWT.NONE);\r
                composite.setLayout(new FormLayout());\r
                // Creates title bar.\r
-               titleBar = new Canvas(composite, SWT.DOUBLE_BUFFERED);\r
-               titleBar.addPaintListener(titlePaintListener);\r
-               titleBar.addListener(SWT.MouseDoubleClick, titleMouseListener);\r
-\r
-               // Creates border area.\r
-               Composite borderArea = new Composite(composite, SWT.NONE);\r
-               borderArea.setLayout(new FormLayout());\r
-               borderArea.setBackground(ColorResources.VIEW_BORDER);\r
-\r
-               // Creates content area.\r
-               contentArea = new Composite(borderArea, SWT.NONE);\r
-               contentArea.setLayout(new FormLayout());\r
-               contentArea.setBackground(ColorResources.VIEW_BG_COLOR);\r
-\r
-               // Sets layout data.\r
-               FormData data = new FormData();\r
-               data.left = new FormAttachment(0, 0);\r
-               data.right = new FormAttachment(100, 0);\r
-               if (titleVisibility) {\r
-                       data.height = DesignConstants.VIEW_TITLEBAR_HEIGHT;\r
-               } else {\r
-                       data.height = 0;\r
-               }\r
-               titleBar.setLayoutData(data);\r
-\r
-               data = new FormData();\r
-               data.top = new FormAttachment(titleBar, 0);\r
-               data.left = new FormAttachment(0, 0);\r
-               data.right = new FormAttachment(100, 0);\r
-               data.bottom = new FormAttachment(100, 0);\r
-               borderArea.setLayoutData(data);\r
-\r
-               data = new FormData();\r
-               data.top = new FormAttachment(0, 3);\r
-               data.left = new FormAttachment(0, 2);\r
-               data.right = new FormAttachment(100, -2);\r
-               data.bottom = new FormAttachment(100, -2);\r
-               contentArea.setLayoutData(data);\r
+                               titleBar = new Canvas(composite, SWT.DOUBLE_BUFFERED);\r
+                               titleBar.addPaintListener(titlePaintListener);\r
+                               titleBar.addListener(SWT.MouseDoubleClick, titleMouseListener);\r
+\r
+                               // Creates border area.\r
+                               Composite borderArea1 = new Composite(composite, SWT.NONE);\r
+                               borderArea1.setLayout(new FormLayout());\r
+                               borderArea1.setBackground(ColorResources.VIEW_BORDER_1);\r
+                               \r
+                               Composite borderArea2 = new Composite(borderArea1, SWT.NONE);\r
+                               borderArea2.setLayout(new FormLayout());\r
+                               borderArea2.setBackground(ColorResources.VIEW_BORDER_2);\r
+                               \r
+                               Composite borderArea3 = new Composite(borderArea2, SWT.NONE);\r
+                               borderArea3.setLayout(new FormLayout());\r
+                               borderArea3.setBackground(ColorResources.VIEW_BORDER_3);\r
+                               \r
+                               // Creates content area.\r
+                               contentArea = new Composite(borderArea3, SWT.NONE);\r
+                               contentArea.setLayout(new FormLayout());\r
+                               contentArea.setBackground(ColorResources.VIEW_BG_COLOR);\r
+\r
+                               // Sets layout data.\r
+                               FormData data = new FormData();\r
+                               data.left = new FormAttachment(0, 0);\r
+                               data.right = new FormAttachment(100, 0);\r
+                               if (titleVisibility) {\r
+                                       data.height = DesignConstants.VIEW_TITLEBAR_HEIGHT;\r
+                               } else {\r
+                                       data.height = 0;\r
+                               }\r
+                               titleBar.setLayoutData(data);\r
+\r
+                               data = new FormData();\r
+                               data.top = new FormAttachment(titleBar, 0);\r
+                               data.left = new FormAttachment(0, 0);\r
+                               data.right = new FormAttachment(100, 0);\r
+                               data.bottom = new FormAttachment(100, 0);\r
+                               borderArea1.setLayoutData(data);\r
+                               \r
+                               data = new FormData();\r
+                               data.top = new FormAttachment(0, 1);\r
+                               data.left = new FormAttachment(0, 1);\r
+                               data.right = new FormAttachment(100, -1);\r
+                               data.bottom = new FormAttachment(100, -1);\r
+                               borderArea2.setLayoutData(data);\r
+                               \r
+                               data = new FormData();\r
+                               data.top = new FormAttachment(0, 4);\r
+                               data.left = new FormAttachment(0, 3);\r
+                               data.right = new FormAttachment(100, -3);\r
+                               data.bottom = new FormAttachment(100, -3);\r
+                               borderArea3.setLayoutData(data);\r
+\r
+                               data = new FormData();\r
+                               data.top = new FormAttachment(0, 0);\r
+                               data.left = new FormAttachment(0, 0);\r
+                               data.right = new FormAttachment(100, 0);\r
+                               data.bottom = new FormAttachment(100, 0);\r
+                               contentArea.setLayoutData(data);\r
        }\r
 \r
        public Canvas getTitleArea(){\r
@@ -107,18 +129,12 @@ public abstract class DAViewComposite extends DABaseComposite {
 \r
                        Rectangle bounds = titleBar.getBounds();\r
                        int width = bounds.width;\r
-                       int height = bounds.height - 2;\r
+                       int height = bounds.height;\r
 \r
                        // Draws background.\r
                        gc.setForeground(ColorResources.TITLEBAR_START_COLOR);\r
                        gc.setBackground(ColorResources.TITLEBAR_END_COLOR);\r
                        gc.fillGradientRectangle(bounds.x, bounds.y, width, height, true);\r
-                       gc.setForeground(ColorResources.TITLEBAR_BOTTOM_STROKE_1);\r
-                       gc.drawLine(bounds.x, bounds.y + height + 1, bounds.x + width,\r
-                                       bounds.y + height + 1);\r
-                       gc.setForeground(ColorResources.TITLEBAR_BOTTOM_STROKE_2);\r
-                       gc.drawLine(bounds.x, bounds.y + height + 2, bounds.x + width,\r
-                                       bounds.y + height + 2);\r
 \r
                        // Draws text.\r
                        gc.setFont(FontResources.VIEW_TITLE);\r