RENDERER: modify separator color on table information control
authorGiWoong Kim <giwoong.kim@samsung.com>
Thu, 9 Jun 2016 05:23:51 +0000 (14:23 +0900)
committerGiWoong Kim <giwoong.kim@samsung.com>
Thu, 9 Jun 2016 09:19:32 +0000 (18:19 +0900)
windowing system color ->  #008aee

Change-Id: I96a08257c72d416b9cdcaa2c85e146ed83229e8c
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java
bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/TizenTabRendering.java

index c784ac5..9f30f73 100644 (file)
  */
 package org.eclipse.e4.ui.internal.workbench.renderers.swt;
 
+import org.eclipse.e4.ui.workbench.renderers.swt.TizenTabRendering;
 import org.eclipse.e4.ui.workbench.swt.internal.copy.SearchPattern;
 import org.eclipse.e4.ui.workbench.swt.internal.copy.WorkbenchSWTMessages;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.util.Util;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -41,15 +43,14 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.FontMetrics;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
@@ -387,8 +388,18 @@ public abstract class AbstractTableInformationControl {
                });
 
                // Horizontal separator line
+               /* Tizen */
+               /*
                Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
                separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+               */
+
+               Canvas separator = new Canvas(parent, SWT.NONE);
+               separator.setBackground(JFaceResources.getColorRegistry().get(TizenTabRendering.TIZEN_POINT_COLOR_2_KEY));
+               GridData separatorData = new GridData(GridData.FILL_HORIZONTAL);
+               separatorData.heightHint = 1;
+               separator.setLayoutData(separatorData);
+               /* ===== */
 
                return fFilterText;
        }
@@ -398,7 +409,7 @@ public abstract class AbstractTableInformationControl {
                /* Tizen */
                // setForegroundColor(display.getSystemColor(SWT.COLOR_INFO_FOREGROUND));
                // setBackgroundColor(display.getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-               setForegroundColor(new Color(display, new RGB(88, 88, 88)));
+               setForegroundColor(JFaceResources.getColorRegistry().get(TizenTabRendering.TIZEN_FG_DARKGRAY_COLOR_KEY));
                setBackgroundColor(display.getSystemColor(SWT.COLOR_WHITE));
                /* ===== */
        }
index 1626f7e..d9fd8a6 100644 (file)
@@ -47,9 +47,11 @@ import org.eclipse.swt.widgets.ToolBar;
 public class TizenTabRendering extends CTabFolderRenderer implements
 ICTabRendering {
        /* Tizen */
-       public static final String TIZEN_POINT_COLOR_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_POINT_COLOR_KEY"; //$NON-NLS-1$
+       public static final String TIZEN_POINT_COLOR_1_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_POINT_COLOR_1_KEY"; //$NON-NLS-1$
+       public static final String TIZEN_POINT_COLOR_2_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_POINT_COLOR_2_KEY"; //$NON-NLS-1$
        public static final String TIZEN_BG_HIGHLIGHT_COLOR_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_BG_HIGHLIGHT_COLOR_KEY"; //$NON-NLS-1$
        public static final String TIZEN_FG_GRAY_COLOR_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_FG_GRAY_COLOR_KEY"; //$NON-NLS-1$
+       public static final String TIZEN_FG_DARKGRAY_COLOR_KEY = "org.eclipse.e4.ui.workbench.renderers.swt.TIZEN_FG_DARKGRAY_COLOR_KEY"; //$NON-NLS-1$
        /* ===== */
 
        private static final String CONTAINS_TOOLBAR = "CTabRendering.containsToolbar"; //$NON-NLS-1$
@@ -121,9 +123,11 @@ ICTabRendering {
                rendererWrapper = new CTabFolderRendererWrapper(this);
 
                /* Tizen */
-               JFaceResources.getColorRegistry().put(TIZEN_POINT_COLOR_KEY, new RGB(0, 150, 221));
+               JFaceResources.getColorRegistry().put(TIZEN_POINT_COLOR_1_KEY, new RGB(0, 150, 221));
+               JFaceResources.getColorRegistry().put(TIZEN_POINT_COLOR_2_KEY, new RGB(0, 142, 238));
                JFaceResources.getColorRegistry().put(TIZEN_BG_HIGHLIGHT_COLOR_KEY, new RGB(170, 170, 170));
                JFaceResources.getColorRegistry().put(TIZEN_FG_GRAY_COLOR_KEY, new RGB(119, 119, 119));
+               JFaceResources.getColorRegistry().put(TIZEN_FG_DARKGRAY_COLOR_KEY, new RGB(70, 70, 70));
                /* ===== */
        }
 
@@ -636,7 +640,7 @@ ICTabRendering {
                        prevColor = gc.getForeground();
                        int prevLineWidth = gc.getLineWidth();
 
-                       gc.setForeground(JFaceResources.getColorRegistry().get(TIZEN_POINT_COLOR_KEY));
+                       gc.setForeground(JFaceResources.getColorRegistry().get(TIZEN_POINT_COLOR_1_KEY));
                        gc.setLineWidth(2);
                        Rectangle itemBounds = parent.getItem(itemIndex).getBounds();
                        gc.drawLine(itemBounds.x, itemBounds.height + 1,