Tab Layout : UI/UX was modified 22/22022/1
authorhyeran74.kim <hyeran74.kim@samsung.com>
Thu, 29 May 2014 01:37:28 +0000 (10:37 +0900)
committerhyeran74.kim <hyeran74.kim@samsung.com>
Thu, 29 May 2014 01:37:28 +0000 (10:37 +0900)
Change-Id: I6bb054d7d045548b6b86294971931d716a9e55c9
Signed-off-by: hyeran74.kim <hyeran74.kim@samsung.com>
18 files changed:
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ColorResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/FontResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/resources/ImageResources.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/theme/DAThemeWhite.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabButton.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/DATabComposite.java
org.tizen.dynamicanalyzer.appearance/src/org/tizen/dynamicanalyzer/widgets/da/view/TabButtonRenderer.java
org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_disable.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_hover.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_normal.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_push.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_drag.png [new file with mode: 0644]
org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_hover.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_normal.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_push.png
org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_selected.png
org.tizen.dynamicanalyzer.widgets/src/org/tizen/dynamicanalyzer/widgets/helper/FontResources.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/page/BaseView.java

index 01d5465..7051121 100755 (executable)
@@ -245,6 +245,7 @@ public class ColorResources {
        public static Color TAB_HOVER_FONT_COLOR = getColor("tab_hover_font_color"); //$NON-NLS-1$\r
        public static Color TAB_PUSH_FONT_COLOR = getColor("tab_push_font_color"); //$NON-NLS-1$\r
 \r
+       public static Color TAB_BG_COLOR = getColor("tab_bg_color"); //$NON-NLS-1$\r
        public static Color TAB_BG_COLOR_START = getColor("tab_bg_color_start"); //$NON-NLS-1$\r
        public static Color TAB_BG_COLOR_END = getColor("tab_bg_color_end"); //$NON-NLS-1$\r
        public static Color TAB_BG_OUTLINE_COLOR = getColor("tab_bg_outline_color"); //$NON-NLS-1$\r
index fd21425..d1320cf 100644 (file)
@@ -55,7 +55,10 @@ public class FontResources {
        public static final Font TAB_BUTTON_FONT = getFont(\r
                        "tab_button_font", resizeDefaultFont(8, 3));//$NON-NLS-1$\r
        // mac 11\r
-\r
+       \r
+       public static final Font TAB_BUTTON_LARGE_FONT = getFont(\r
+                       "tab_button_large_font", resizeDefaultFont(9, 2));//$NON-NLS-1$\r
+       \r
        // * Time-Line Layout\r
        // Edit Chart Dlg.\r
        public static final Font ADDITEM_BUTTON_FONT = getFont(\r
index f55b9b1..e749743 100644 (file)
@@ -123,9 +123,11 @@ public class ImageResources {
 \r
        // Tab\r
        public static final Image TAB = getPngImage("tab_unselected"); //$NON-NLS-1$\r
+       public static final Image TAB_NORMAL = getPngImage("tab_normal"); //$NON-NLS-1$\r
        public static final Image TAB_PUSH = getPngImage("tab_push"); //$NON-NLS-1$\r
        public static final Image TAB_HOVER = getPngImage("tab_hover"); //$NON-NLS-1$\r
-       public static final Image TAB_DISABLE = getPngImage("tab_selected"); //$NON-NLS-1$\r
+       public static final Image TAB_SELECTED = getPngImage("tab_selected"); //$NON-NLS-1$\r
+       public static final Image TAB_DRAG = getPngImage("tab_dag"); //$NON-NLS-1$\r
 \r
        // Trim\r
        public static final Image WINDOW_TOP = getPngImage("window_top_pattern_01"); //$NON-NLS-1$\r
index db46618..682b8c6 100644 (file)
@@ -232,25 +232,26 @@ public class DAThemeWhite extends DATheme {
                setColor("open_trace_table2_font_color", new RGB(255, 85, 57)); //$NON-NLS-1$
 
                /** tab widget colors **/
-               setColor("tab_selected_color_start", new RGB(255, 255, 255));
-               setColor("tab_selected_color_end", new RGB(178, 178, 178));
-               setColor("tab_normal_color_start", new RGB(206, 206, 206));
-               setColor("tab_normal_color_end", new RGB(163, 163, 163));
-               setColor("tab_hover_color_start", new RGB(206, 206, 206));
-               setColor("tab_hover_color_end", new RGB(163, 163, 163));
-               setColor("tab_push_color_start", new RGB(163, 163, 163));
-               setColor("tab_push_color_end", new RGB(206, 206, 206));
-
-               setColor("tab_outline_normal_color", new RGB(115, 115, 115));
-               setColor("tab_outline_push_color", new RGB(10, 113, 178));
-               setColor("tab_outline_hover_color", new RGB(10, 113, 178));
-               setColor("tab_outline_selected_color", new RGB(160, 160, 160));
+               setColor("tab_selected_color_start", new RGB(148, 194, 201));
+               setColor("tab_selected_color_end", new RGB(88, 167, 179));
+               setColor("tab_normal_color_start", new RGB(39, 81, 89));
+               setColor("tab_normal_color_end", new RGB(15, 45, 50));
+               setColor("tab_hover_color_start", new RGB(39, 81, 89));
+               setColor("tab_hover_color_end", new RGB(15, 45, 50));
+               setColor("tab_push_color_start", new RGB(15, 45, 50));
+               setColor("tab_push_color_end", new RGB(39, 81, 89));
+
+               setColor("tab_outline_normal_color", new RGB(0, 0, 0));
+               setColor("tab_outline_push_color", new RGB(106, 154, 163));
+               setColor("tab_outline_hover_color", new RGB(106, 154, 163));
+               setColor("tab_outline_selected_color", new RGB(232, 234, 235));
 
                setColor("tab_selected_font_color", new RGB(0, 0, 0));
-               setColor("tab_normal_font_color", new RGB(91, 91, 91));
-               setColor("tab_hover_font_color", new RGB(91, 91, 91));
-               setColor("tab_push_font_color", new RGB(91, 91, 91));
+               setColor("tab_normal_font_color", new RGB(184, 184, 184));
+               setColor("tab_hover_font_color", new RGB(184, 184, 184));
+               setColor("tab_push_font_color", new RGB(184, 184, 184));
 
+               setColor("tab_bg_color", new RGB(47, 85, 92));
                setColor("tab_bg_color_start", new RGB(205, 205, 205));
                setColor("tab_bg_color_end", new RGB(216, 216, 216));
                setColor("tab_bg_outline_color", new RGB(160, 160, 160));
index 58ecbfd..cc8bf6a 100644 (file)
@@ -49,7 +49,7 @@ public class DATabButton extends DACustomButton {
        private Rectangle closeButtonRect = null;
        private DACustomButtonClickEventListener closeButtonListener = null;
 
-       public DATabButton(Composite parent, int style) {
+       public DATabButton(Composite parent, int style, boolean isImageTab) {
                super(parent, ColorResources.TAB_NORMAL_COLOR_START,
                                ColorResources.TAB_NORMAL_COLOR_END,
                                ColorResources.TAB_PUSH_COLOR_START,
@@ -58,7 +58,12 @@ public class DATabButton extends DACustomButton {
                                ColorResources.TAB_HOVER_COLOR_END,
                                ColorResources.TAB_SELECTED_COLOR_START,
                                ColorResources.TAB_SELECTED_COLOR_END);
-               this.setLayout(new FormLayout());
+               if(isImageTab) {
+                       this.setImages(ImageResources.TAB_NORMAL,
+                               ImageResources.TAB_PUSH,
+                               ImageResources.TAB_HOVER,
+                               ImageResources.TAB_SELECTED);
+               }
 
                this.addListener(SWT.MouseMove, tbMouseEventListener);
                this.addListener(SWT.MouseDown, tbMouseEventListener);
@@ -78,8 +83,8 @@ public class DATabButton extends DACustomButton {
                        if (null == closeButtonRect) {
                                Rectangle imgRect = button.getCloseButtonImage().getBounds();
                                Rectangle rect = button.getBounds();
-                               closeButtonRect = new Rectangle(rect.width - imgRect.width - 2,
-                                               (rect.height - imgRect.height) / 2, imgRect.width,
+                               closeButtonRect = new Rectangle(rect.width - imgRect.width - 6,
+                                               rect.y + 1, imgRect.width,
                                                imgRect.height);
                        }
 
index d616485..acf0274 100644 (file)
@@ -74,7 +74,8 @@ public class DATabComposite extends DABaseComposite {
        private int targetButtonIndex = -1;
        private int sourceButtonIndex = -1;
        private boolean drag = false;
-
+       
+       private boolean isImageTab = false;
        private int tabWidth = LONG_TAB_WIDTH;
 
        {
@@ -125,11 +126,9 @@ public class DATabComposite extends DABaseComposite {
                public void paintControl(PaintEvent e) {
                        Composite comp = (Composite) e.widget;
                        Rectangle rect = comp.getClientArea();
-                       e.gc.setForeground(ColorResources.TAB_BG_COLOR_START);
-                       e.gc.setBackground(ColorResources.TAB_BG_COLOR_END);
+                       e.gc.setBackground(ColorResources.TAB_BG_COLOR);
                        e.gc.fillGradientRectangle(rect.x, rect.y, rect.width, rect.height,
                                        true);
-                       e.gc.setForeground(ColorResources.TAB_BG_OUTLINE_COLOR);
                        e.gc.drawRectangle(rect);
                }
        };
@@ -163,7 +162,14 @@ public class DATabComposite extends DABaseComposite {
 
                String title = child.getTitle();
 
-               final DATabButton tabButton = new DATabButton(tabComposite, SWT.NONE);
+               final DATabButton tabButton;
+               if(isImageTab) {
+                       tabButton = new DATabButton(tabComposite, SWT.NONE, true);
+                       tabButton.setButtonFont(FontResources.TAB_BUTTON_FONT);
+               } else {
+                       tabButton = new DATabButton(tabComposite, SWT.NONE, false);
+                       tabButton.setButtonFont(FontResources.TAB_BUTTON_LARGE_FONT);
+               }
                tabButton.setFontColors(ColorResources.TAB_NORMAL_FONT_COLOR,
                                ColorResources.TAB_PUSH_FONT_COLOR,
                                ColorResources.TAB_HOVER_FONT_COLOR,
@@ -174,15 +180,15 @@ public class DATabComposite extends DABaseComposite {
                                ColorResources.TAB_OUTLINE_SELECTED_COLOR);
                tabButton.setRenderer(new TabButtonRenderer());
                tabButton.setButtonEnabled(true);
-               tabButton.setButtonFont(FontResources.TAB_BUTTON_FONT);
+               tabButton.setBackground(ColorResources.TAB_BG_COLOR);
                tabButton.setText(title);
                tabButton.setToolTipText((String) child.getData("tooltip"));
                tabButton.setClosable(closeable);
 
                FormData data = new FormData();
-               data.top = new FormAttachment(0, 0);
+               data.top = new FormAttachment(0, 1);
                data.bottom = new FormAttachment(100, 0);
-
+               
                if (buttons.size() > 0) {
                        DATabButton lastbutton = buttons.get(buttons.size() - 1);
                        data.left = new FormAttachment(lastbutton, 0);
@@ -274,7 +280,7 @@ public class DATabComposite extends DABaseComposite {
                                                                contentsComposite.layout();
                                                        } else {
                                                                if (r.contains(curPosition.x, 0)
-                                                                               && (event.y > r.y && event.y < r.y
+                                                                                && (event.y > r.y && event.y < r.y
                                                                                                + r.height)) {
                                                                        btn.changeButtonState(DACustomButton.STATE_HOVER);
                                                                } else {
@@ -378,7 +384,7 @@ public class DATabComposite extends DABaseComposite {
        // positioning of the tab button
        private void setLayoutTabs(int leftTabIndex, int tabIndex) {
                FormData data = new FormData();
-               data.top = new FormAttachment(0, 0);
+               data.top = new FormAttachment(0, 1);
                data.bottom = new FormAttachment(100, 0);
                data.width = tabWidth;
                if (leftTabIndex != -1) {
@@ -513,6 +519,10 @@ public class DATabComposite extends DABaseComposite {
        public void setTabWidth(int size) {
                tabWidth = size;
        }
+       
+       public void isImageTab(boolean isImageTab) {
+               this.isImageTab = isImageTab;
+       }
 
        @Override
        public DABaseComposite getView(String ID) {
index a351eab..bbc8da6 100644 (file)
@@ -63,7 +63,7 @@ public class TabButtonRenderer implements IDACustomButtonRenderer {
                if (button.isClosable()) {
                        Image img = button.getCloseButtonImage();
                        Rectangle imgRect = img.getBounds();
-                       gc.drawImage(img, rect.width - imgRect.width, rect.y + 1);
+                       gc.drawImage(img, rect.width - imgRect.width - 6, rect.y + 1);
                }
        }
 
index 297e4e6..cb9d208 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_disable.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_disable.png differ
index 8344353..b28ca58 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_hover.png differ
index 577896a..7f9572b 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_normal.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_normal.png differ
index 96795d1..c884054 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/close_box_push.png differ
diff --git a/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_drag.png b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_drag.png
new file mode 100644 (file)
index 0000000..58b74a1
Binary files /dev/null and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_drag.png differ
index 9ee228a..75ba5d4 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_hover.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_hover.png differ
index 5e3df0c..2e08e6e 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_normal.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_normal.png differ
index 0303d7b..2a49f77 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_push.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_push.png differ
index 2984f8b..f759a88 100644 (file)
Binary files a/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_selected.png and b/org.tizen.dynamicanalyzer.appearance/theme/white/img/tab_selected.png differ
index 53b27c8..d9a5a7e 100644 (file)
@@ -114,6 +114,8 @@ public class FontResources {
                        "additem_button_font", resizeSystemFont(8));//$NON-NLS-1$\r
        public static final Font TAB_BUTTON_FONT = getFont(\r
                        "tab_button_font", resizeSystemFont(10));//$NON-NLS-1$\r
+       public static final Font TAB_BUTTON__LARGE_FONT = getFont(\r
+                       "tab_button_large_font", resizeSystemFont(10));//$NON-NLS-1$\r
 \r
        public static final Font CURRENT_TABLE_HEADER_FONT = getFont(\r
                        "current_table_header_font", resizeSystemFont(8));//$NON-NLS-1$\r
index bc7f47c..2f8fb0c 100755 (executable)
@@ -60,7 +60,8 @@ public class BaseView extends ViewPart {
 
                // create tab view in base composite
                tabView = new DATabComposite(parent, SWT.DOUBLE_BUFFERED);
-               tabView.setTabWidth(110);
+               tabView.setTabWidth(114);
+               tabView.isImageTab(true);
                {
                        DABaseComposite timelinePage = new TimelinePage(
                                        tabView.getContentComposite(), SWT.NONE);