From 50a0e1a6873b444e548ea5890355ec27a3d5d47e Mon Sep 17 00:00:00 2001 From: "hyeran74.kim" Date: Tue, 27 May 2014 14:14:55 +0900 Subject: [PATCH] Title Layout : UX/UI was modified Change-Id: I1defcd4bb64993515bf40c114765e30299500256 Signed-off-by: hyeran74.kim Change-ID: Ia4ba2844d1fa26325fbd30afae22603cd9168ad2 --- .../dynamicanalyzer/resources/ColorResources.java | 3 + .../tizen/dynamicanalyzer/theme/DAThemeWhite.java | 9 +- .../widgets/da/view/DAViewComposite.java | 106 ++++++++++++--------- 3 files changed, 70 insertions(+), 48 deletions(-) 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 --- 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$ public static Color VIEW_BORDER = getColor("view_border"); //$NON-NLS-1$ + public static Color VIEW_BORDER_1 = getColor("view_border_1"); //$NON-NLS-1$ + public static Color VIEW_BORDER_2 = getColor("view_border_2"); //$NON-NLS-1$ + public static Color VIEW_BORDER_3 = getColor("view_border_3"); //$NON-NLS-1$ public static Color VIEW_BG_COLOR = getColor("view_bg_color"); //$NON-NLS-1$ public static Color VIEW_TITLE_FONT_COLOR = getColor("view_title_font_color");//$NON-NLS-1$ 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 --- 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 --- 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); composite.setLayout(new FormLayout()); // Creates title bar. - titleBar = new Canvas(composite, SWT.DOUBLE_BUFFERED); - titleBar.addPaintListener(titlePaintListener); - titleBar.addListener(SWT.MouseDoubleClick, titleMouseListener); - - // Creates border area. - Composite borderArea = new Composite(composite, SWT.NONE); - borderArea.setLayout(new FormLayout()); - borderArea.setBackground(ColorResources.VIEW_BORDER); - - // Creates content area. - contentArea = new Composite(borderArea, SWT.NONE); - contentArea.setLayout(new FormLayout()); - contentArea.setBackground(ColorResources.VIEW_BG_COLOR); - - // Sets layout data. - FormData data = new FormData(); - data.left = new FormAttachment(0, 0); - data.right = new FormAttachment(100, 0); - if (titleVisibility) { - data.height = DesignConstants.VIEW_TITLEBAR_HEIGHT; - } else { - data.height = 0; - } - titleBar.setLayoutData(data); - - data = new FormData(); - data.top = new FormAttachment(titleBar, 0); - data.left = new FormAttachment(0, 0); - data.right = new FormAttachment(100, 0); - data.bottom = new FormAttachment(100, 0); - borderArea.setLayoutData(data); - - data = new FormData(); - data.top = new FormAttachment(0, 3); - data.left = new FormAttachment(0, 2); - data.right = new FormAttachment(100, -2); - data.bottom = new FormAttachment(100, -2); - contentArea.setLayoutData(data); + titleBar = new Canvas(composite, SWT.DOUBLE_BUFFERED); + titleBar.addPaintListener(titlePaintListener); + titleBar.addListener(SWT.MouseDoubleClick, titleMouseListener); + + // Creates border area. + Composite borderArea1 = new Composite(composite, SWT.NONE); + borderArea1.setLayout(new FormLayout()); + borderArea1.setBackground(ColorResources.VIEW_BORDER_1); + + Composite borderArea2 = new Composite(borderArea1, SWT.NONE); + borderArea2.setLayout(new FormLayout()); + borderArea2.setBackground(ColorResources.VIEW_BORDER_2); + + Composite borderArea3 = new Composite(borderArea2, SWT.NONE); + borderArea3.setLayout(new FormLayout()); + borderArea3.setBackground(ColorResources.VIEW_BORDER_3); + + // Creates content area. + contentArea = new Composite(borderArea3, SWT.NONE); + contentArea.setLayout(new FormLayout()); + contentArea.setBackground(ColorResources.VIEW_BG_COLOR); + + // Sets layout data. + FormData data = new FormData(); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(100, 0); + if (titleVisibility) { + data.height = DesignConstants.VIEW_TITLEBAR_HEIGHT; + } else { + data.height = 0; + } + titleBar.setLayoutData(data); + + data = new FormData(); + data.top = new FormAttachment(titleBar, 0); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(100, 0); + data.bottom = new FormAttachment(100, 0); + borderArea1.setLayoutData(data); + + data = new FormData(); + data.top = new FormAttachment(0, 1); + data.left = new FormAttachment(0, 1); + data.right = new FormAttachment(100, -1); + data.bottom = new FormAttachment(100, -1); + borderArea2.setLayoutData(data); + + data = new FormData(); + data.top = new FormAttachment(0, 4); + data.left = new FormAttachment(0, 3); + data.right = new FormAttachment(100, -3); + data.bottom = new FormAttachment(100, -3); + borderArea3.setLayoutData(data); + + data = new FormData(); + data.top = new FormAttachment(0, 0); + data.left = new FormAttachment(0, 0); + data.right = new FormAttachment(100, 0); + data.bottom = new FormAttachment(100, 0); + contentArea.setLayoutData(data); } public Canvas getTitleArea(){ @@ -107,18 +129,12 @@ public abstract class DAViewComposite extends DABaseComposite { Rectangle bounds = titleBar.getBounds(); int width = bounds.width; - int height = bounds.height - 2; + int height = bounds.height; // Draws background. gc.setForeground(ColorResources.TITLEBAR_START_COLOR); gc.setBackground(ColorResources.TITLEBAR_END_COLOR); gc.fillGradientRectangle(bounds.x, bounds.y, width, height, true); - gc.setForeground(ColorResources.TITLEBAR_BOTTOM_STROKE_1); - gc.drawLine(bounds.x, bounds.y + height + 1, bounds.x + width, - bounds.y + height + 1); - gc.setForeground(ColorResources.TITLEBAR_BOTTOM_STROKE_2); - gc.drawLine(bounds.x, bounds.y + height + 2, bounds.x + width, - bounds.y + height + 2); // Draws text. gc.setFont(FontResources.VIEW_TITLE); -- 2.7.4