Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 96483 Details for
Bug 227541
Minor UI improvements to the new palette look
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
[patch]
Removed unused imports from patch.
PaletteUITweaks.txt (text/plain), 23.04 KB, created by
Cherie Revells
on 2008-04-17 14:08:25 EDT
(
hide
)
Description:
Removed unused imports from patch.
Filename:
MIME Type:
Creator:
Cherie Revells
Created:
2008-04-17 14:08:25 EDT
Size:
23.04 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.gef >Index: src/org/eclipse/gef/internal/ui/palette/editparts/PinnablePaletteStackFigure.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PinnablePaletteStackFigure.java,v >retrieving revision 1.2 >diff -u -r1.2 PinnablePaletteStackFigure.java >--- src/org/eclipse/gef/internal/ui/palette/editparts/PinnablePaletteStackFigure.java 7 Apr 2008 20:42:09 -0000 1.2 >+++ src/org/eclipse/gef/internal/ui/palette/editparts/PinnablePaletteStackFigure.java 17 Apr 2008 18:07:39 -0000 >@@ -12,7 +12,6 @@ > package org.eclipse.gef.internal.ui.palette.editparts; > > import java.util.Iterator; >-import java.util.List; > > import org.eclipse.swt.graphics.Color; > >@@ -22,6 +21,7 @@ > import org.eclipse.draw2d.ButtonModel; > import org.eclipse.draw2d.ChangeEvent; > import org.eclipse.draw2d.ChangeListener; >+import org.eclipse.draw2d.Clickable; > import org.eclipse.draw2d.Figure; > import org.eclipse.draw2d.FigureUtilities; > import org.eclipse.draw2d.FlowLayout; >@@ -37,6 +37,7 @@ > import org.eclipse.draw2d.geometry.Rectangle; > > import org.eclipse.gef.internal.ui.palette.PaletteColorUtil; >+import org.eclipse.gef.internal.ui.palette.editparts.ToolEntryEditPart.ToolEntryToggle; > import org.eclipse.gef.ui.palette.PaletteViewerPreferences; > > /** >@@ -70,6 +71,8 @@ > > private static final Dimension EMPTY_DIMENSION = new Dimension(0, 0); > >+static final int ARROW_WIDTH = 9; >+ > /** > * A toggle with a triangle figure. > */ >@@ -81,7 +84,7 @@ > setRolloverEnabled(true); > setBorder(null); > setOpaque(false); >- setPreferredSize(11, -1); >+ setPreferredSize(ARROW_WIDTH, -1); > } > > /** >@@ -92,36 +95,46 @@ > } > > public void paintFigure(Graphics graphics) { >- Rectangle rect = getBounds().getCopy(); >+ Rectangle rect = getClientArea(); >+ >+ ButtonModel model = getModel(); >+ if (isRolloverEnabled() && model.isMouseOver()) { >+ graphics.setBackgroundColor(PaletteColorUtil.ARROW_HOVER); >+ graphics.fillRoundRectangle(rect, 3, 3); >+ } > > graphics.translate(getLocation()); > > // fill the arrow > int[] points = new int[8]; > >+ int middleY = rect.height / 2; > if (isSelected() || layoutMode == PaletteViewerPreferences.LAYOUT_ICONS > || layoutMode == PaletteViewerPreferences.LAYOUT_COLUMNS) { > // pointing down >- points[0] = 4; >- points[1] = rect.height / 2; >- points[2] = 9; >- points[3] = rect.height / 2; >- points[4] = 6; >- points[5] = rect.height / 2 + 3; >- points[6] = 4; >- points[7] = rect.height / 2; >+ int startingX = (ARROW_WIDTH - 5) / 2; // triangle width = 5 >+ points[0] = startingX; >+ points[1] = middleY; >+ points[2] = startingX + 5; >+ points[3] = middleY; >+ points[4] = startingX + 2; >+ points[5] = middleY + 3; >+ points[6] = startingX; >+ points[7] = middleY; > } else { > // pointing to the right >- points[0] = 5; >- points[1] = rect.height / 2 - 2; >- points[2] = 8; >- points[3] = rect.height / 2 + 1; >- points[4] = 5; >- points[5] = rect.height / 2 + 4; >- points[6] = 5; >- points[7] = rect.height / 2 - 2; >+ int startingX = (ARROW_WIDTH - 3) / 2; // triangle width = 3 >+ points[0] = startingX; >+ points[1] = middleY - 2; >+ points[2] = startingX + 3; >+ points[3] = middleY + 1; >+ points[4] = startingX; >+ points[5] = middleY + 4; >+ points[6] = startingX; >+ points[7] = middleY - 2; > } > >+ graphics.setBackgroundColor(PaletteColorUtil.WIDGET_DARK_SHADOW); > graphics.fillPolygon(points); > > graphics.translate(getLocation().getNegated()); >@@ -130,6 +143,36 @@ > > /** > * Layout manager for the palette stack header figure that handles the layout of >+ * the <code>headerFigure</code> (<code>arrowFigure</code> and the active >+ * tool figure) when in icons or columns layout mode. >+ */ >+private class HeaderIconLayout >+ extends StackLayout { >+ >+protected boolean isSensitiveVertically(IFigure container) { >+ return false; >+} >+ >+public void layout(IFigure parent) { >+ >+ Rectangle r = parent.getClientArea(); >+ >+ activeToolFigure.setBounds(r); >+ >+ // All tool figures have saved an area in its margin for the arrow figure in >+ // case that tool figure is in a stack (see the BORDER variables in >+ // ToolEntryEditPart). Calculate the arrow figure bounds by using the insets >+ // of the active tool figure. >+ r.x = r.right() - ToolEntryEditPart.ICON_HIGHLIGHT_INSETS.right - ARROW_WIDTH; >+ r.y += ToolEntryEditPart.ICON_HIGHLIGHT_INSETS.top; >+ r.width = ARROW_WIDTH; >+ r.height -= ToolEntryEditPart.ICON_HIGHLIGHT_INSETS.getHeight(); >+ arrowFigure.setBounds(r); >+} >+} >+ >+/** >+ * Layout manager for the palette stack header figure that handles the layout of > * the <code>headerFigure</code> (<code>pinFigure</code>, > * <code>arrowFigure</code>, and the active tool figure) when in list or > * details layout mode. >@@ -156,28 +199,27 @@ > public void layout(IFigure parent) { > > Rectangle r = parent.getClientArea(); >- List children = parent.getChildren(); >- IFigure child; >- > Dimension pinSize = isExpanded() ? pinFigure.getPreferredSize() > : EMPTY_DIMENSION; > >- for (int i = 0; i < children.size(); i++) { >- child = (IFigure) children.get(i); >- if (child == arrowFigure) { >- Rectangle.SINGLETON.setBounds(r); >- Rectangle.SINGLETON.width = 11; >- child.setBounds(Rectangle.SINGLETON); >- } else if (child == pinFigure) { >- Rectangle.SINGLETON.setSize(pinSize); >- Rectangle.SINGLETON.setLocation(r.right() - pinSize.width, r >- .getCenter().y >- - (pinSize.height / 2)); >- child.setBounds(Rectangle.SINGLETON); >- } else { >- child.setBounds(r.getResized(-pinSize.width, 0)); >- } >- } >+ // layout the pin figure >+ Rectangle.SINGLETON.setSize(pinSize); >+ Rectangle.SINGLETON.setLocation(r.right() - pinSize.width, r.getCenter().y >+ - (pinSize.height / 2)); >+ pinFigure.setBounds(Rectangle.SINGLETON); >+ >+ activeToolFigure.setBounds(r.getResized(-pinSize.width, 0)); >+ >+ // All tool figures have saved an area in its margin for the arrow figure in >+ // case that tool figure is in a stack (see the BORDER variables in >+ // ToolEntryEditPart). Calculate the arrow figure bounds by using the insets >+ // of the active tool figure. >+ r.x += ToolEntryEditPart.LIST_HIGHLIGHT_INSETS.left; >+ r.y += ToolEntryEditPart.LIST_HIGHLIGHT_INSETS.top; >+ r.width = ARROW_WIDTH; >+ r.height -= ToolEntryEditPart.LIST_HIGHLIGHT_INSETS.getHeight(); >+ arrowFigure.setBounds(r); >+ > } > } > >@@ -222,7 +264,11 @@ > private ChangeListener clickableArrowListener = new ChangeListener() { > > public void handleStateChanged(ChangeEvent event) { >- if (event.getPropertyName().equals(ButtonModel.SELECTED_PROPERTY)) { >+ Clickable clickable = (Clickable)event.getSource(); >+ if (event.getPropertyName() == ButtonModel.MOUSEOVER_PROPERTY && getActiveFigure() instanceof ToolEntryToggle) { >+ ((ToolEntryToggle)getActiveFigure()).setShowHoverFeedback(clickable.getModel().isMouseOver()); >+ } >+ if (event.getPropertyName() == ButtonModel.SELECTED_PROPERTY) { > > Animation.markBegin(); > handleExpandStateChanged(); >@@ -250,22 +296,6 @@ > } > } > } >- >- // The auto-collapsing of drawers is handled in the >- // PaletteAnimator. >- // If a stack is expanded when there is not enough room to fit >- // the >- // expanded stack than other drawers should be collapsed. >- // However, >- // when the animation is run the first time in this method the >- // drawer layout has not yet completed so other drawers are not >- // collapsed. This 'second pass' of the animation will ensure >- // that >- // drawers get collapsed if necessary as a result of the newly >- // expanded stack. >- Animation.markBegin(); >- revalidate(); >- Animation.run(150); > } > } > } >@@ -289,7 +319,6 @@ > super(); > > arrowFigure = new RolloverArrow(); >- arrowFigure.setBackgroundColor(PaletteColorUtil.WIDGET_DARK_SHADOW); > arrowFigure.addChangeListener(clickableArrowListener); > > headerFigure = new Figure(); >@@ -415,14 +444,14 @@ > } > > /** >- * @return <code>true</code> if the drawer is expanded >+ * @return <code>true</code> if the palette stack is expanded > */ > public boolean isExpanded() { > return arrowFigure.getModel().isSelected(); > } > > /** >- * @return <code>true</code> if the drawer is expanded and is pinned (i.e., it >+ * @return <code>true</code> if the palette stack is expanded and is pinned (i.e., it > * can't be automatically collapsed) > */ > public boolean isPinnedOpen() { >@@ -470,11 +499,10 @@ > setLayoutManager(new ToolbarLayout()); > > } else { >- headerFigure.setLayoutManager(new BorderLayout()); >+ headerFigure.setLayoutManager(new HeaderIconLayout()); > if (activeToolFigure != null) { > headerFigure.setConstraint(activeToolFigure, BorderLayout.CENTER); > } >- headerFigure.setConstraint(arrowFigure, BorderLayout.RIGHT); > > setLayoutManager(new PaletteStackIconLayout()); > >Index: src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java,v >retrieving revision 1.33 >diff -u -r1.33 ToolEntryEditPart.java >--- src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java 7 Apr 2008 20:42:09 -0000 1.33 >+++ src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java 17 Apr 2008 18:07:39 -0000 >@@ -31,6 +31,7 @@ > import org.eclipse.draw2d.IFigure; > import org.eclipse.draw2d.MarginBorder; > import org.eclipse.draw2d.Toggle; >+import org.eclipse.draw2d.geometry.Insets; > import org.eclipse.draw2d.geometry.Rectangle; > > import org.eclipse.gef.AccessibleEditPart; >@@ -201,6 +202,114 @@ > } > } > >+/** >+ * The figure for for a <code>ToolEntryEditPart</code>. >+ */ >+class ToolEntryToggle >+ extends Toggle { >+ >+private boolean showHoverFeedback = false; >+ >+ToolEntryToggle(IFigure contents) { >+ super(contents); >+ setOpaque(false); >+ setEnabled(true); >+ if (isToolbarItem() >+ && !PaletteStack.PALETTE_TYPE_STACK.equals(getPaletteEntry() >+ .getParent().getType())) { >+ setStyle(Clickable.STYLE_BUTTON | Clickable.STYLE_TOGGLE); >+ setBorder(TOOLBAR_ITEM_BORDER); >+ } >+} >+public boolean containsPoint(int x, int y) { >+ Rectangle rect = getBounds().getCopy(); >+ if (customLabel.getBorder() == ICON_BORDER) { >+ rect.width -= PinnablePaletteStackFigure.ARROW_WIDTH; >+ } else if (customLabel.getBorder() == LIST_BORDER) { >+ rect.width -= PinnablePaletteStackFigure.ARROW_WIDTH; >+ rect.x += PinnablePaletteStackFigure.ARROW_WIDTH; >+ } >+ return rect.contains(x, y); >+} >+ >+public IFigure findMouseEventTargetAt(int x, int y) { >+ return null; >+} >+ >+public IFigure getToolTip() { >+ return createToolTip(); >+} >+ >+public void setEnabled(boolean value) { >+ super.setEnabled(value); >+ if (isEnabled()) { >+ setRolloverEnabled(true); >+ if (getFlag(STYLE_BUTTON)) { >+ setBorder(TOOLBAR_ITEM_BORDER); >+ } >+ setForegroundColor(null); >+ } else { >+ if (getFlag(STYLE_BUTTON)) { >+ setBorder(null); >+ } >+ setRolloverEnabled(false); >+ setForegroundColor(ColorConstants.gray); >+ } >+} >+ >+protected void paintFigure(Graphics graphics) { >+ super.paintFigure(graphics); >+ >+ if (!isToolbarItem() && isEnabled() && isRolloverEnabled()) { >+ ButtonModel model = getModel(); >+ >+ if (model.isSelected()) { >+ graphics.setBackgroundColor(PaletteColorUtil.getSelectedColor()); >+ graphics.fillRoundRectangle(getSelectionRectangle( >+ getLayoutSetting(), customLabel), 3, 3); >+ } else if (model.isMouseOver() || showHoverFeedback) { >+ graphics.setBackgroundColor(PaletteColorUtil.getHoverColor()); >+ graphics.fillRoundRectangle(getSelectionRectangle( >+ getLayoutSetting(), customLabel), 3, 3); >+ } >+ } >+} >+ >+protected void paintBorder(Graphics graphics) { >+ if (!isToolbarItem() && isEnabled()) { >+ >+ if (getBorder() != null) >+ getBorder().paint(this, graphics, NO_INSETS); >+ if (hasFocus()) { >+ graphics.setForegroundColor(ColorConstants.black); >+ graphics.setBackgroundColor(ColorConstants.white); >+ >+ Rectangle area = getSelectionRectangle(getLayoutSetting(), >+ customLabel); >+ if (isStyle(STYLE_BUTTON)) >+ graphics.drawFocus(area.x, area.y, area.width, area.height); >+ else >+ graphics.drawFocus(area.x, area.y, area.width - 1, >+ area.height - 1); >+ } >+ } else { >+ super.paintBorder(graphics); >+ } >+} >+ >+/** >+ * Should hover feedback be shown? Allows other palette entities to control when >+ * the hover feedback should be shown on this tool entry. >+ * >+ * @param showHoverFeedback >+ * true if the hover feedback is to be shown; false otherwise. >+ */ >+public void setShowHoverFeedback(boolean showHoverFeedback) { >+ this.showHoverFeedback = showHoverFeedback; >+ repaint(); >+} >+} >+ > private static final String ACTIVE_STATE = "active"; //$NON-NLS-1$ > private DetailedLabelFigure customLabel; > >@@ -245,88 +354,24 @@ > > static final Border TOOLBAR_ITEM_BORDER = new ButtonBorder( > ButtonBorder.SCHEMES.TOOLBAR); >-static final Border COLUMNS_BORDER = new MarginBorder(2, 0, 1, 0); >-static final Border LIST_BORDER = new MarginBorder(3, 16, 2, 0); >-static final Border ICON_BORDER = new MarginBorder(3, 3, 3, 3); > >-public IFigure createFigure() { >- class InactiveToggleButton extends Toggle { >- >- InactiveToggleButton(IFigure contents) { >- super(contents); >- setOpaque(false); >- setEnabled(true); >- if (isToolbarItem() >- && !PaletteStack.PALETTE_TYPE_STACK.equals(getPaletteEntry() >- .getParent().getType())) { >- setStyle(Clickable.STYLE_BUTTON | Clickable.STYLE_TOGGLE); >- setBorder(TOOLBAR_ITEM_BORDER); >- } >- } >- public IFigure findMouseEventTargetAt(int x, int y) { >- return null; >- } >- public IFigure getToolTip() { >- return createToolTip(); >- } >- public void setEnabled(boolean value) { >- super.setEnabled(value); >- if (isEnabled()) { >- setRolloverEnabled(true); >- if (getFlag(STYLE_BUTTON)) { >- setBorder(TOOLBAR_ITEM_BORDER); >- } >- setForegroundColor(null); >- } else { >- if (getFlag(STYLE_BUTTON)) { >- setBorder(null); >- } >- setRolloverEnabled(false); >- setForegroundColor(ColorConstants.gray); >- } >- } >- protected void paintFigure(Graphics graphics) { >- super.paintFigure(graphics); >- >- if (!isToolbarItem() && isEnabled()) { >- ButtonModel model = getModel(); >- if (isRolloverEnabled() && !model.isMouseOver() && !model.isSelected()) >- return; >- >- if (model.isSelected()) { >- graphics.setBackgroundColor(PaletteColorUtil.getSelectedColor()); >- } else { >- graphics.setBackgroundColor(PaletteColorUtil.getHoverColor()); >- } >- graphics.fillRoundRectangle(getSelectionRectangle( >- getLayoutSetting(), customLabel), 3, 3); >- } >- } >- protected void paintBorder(Graphics graphics) { >- if (!isToolbarItem() && isEnabled()) { >+// The following are the insets that the bounds of the label figure should be >+// cropped to paint the blue/orange select and hover feedback rectangles. >+static final Insets LIST_HIGHLIGHT_INSETS = new Insets(1, 5, 2, 0); >+static final Insets ICON_HIGHLIGHT_INSETS = new Insets(2, 1, 2, 1); >+ >+// The following are the borders that go around the entire tool figure to >+// provide room to draw the arrow and outline of the palette stack figure if >+// this tool happens to appear as the active tool of a stack. >+static final Border LIST_BORDER = new MarginBorder(3, >+ PinnablePaletteStackFigure.ARROW_WIDTH + 7, 4, 0); >+static final Border ICON_BORDER = new MarginBorder(4, 4, 3, >+ PinnablePaletteStackFigure.ARROW_WIDTH + 4); > >- if (getBorder() != null) >- getBorder().paint(this, graphics, NO_INSETS); >- if (hasFocus()) { >- graphics.setForegroundColor(ColorConstants.black); >- graphics.setBackgroundColor(ColorConstants.white); >- >- Rectangle area = getSelectionRectangle( >- getLayoutSetting(), customLabel); >- if (isStyle(STYLE_BUTTON)) >- graphics.drawFocus(area.x, area.y, area.width, area.height); >- else >- graphics.drawFocus(area.x, area.y, area.width - 1, area.height - 1); >- } >- } else { >- super.paintBorder(graphics); >- } >- } >- >- } >+public IFigure createFigure() { > > customLabel = new DetailedLabelFigure(); >- Clickable button = new InactiveToggleButton(customLabel); >+ Clickable button = new ToolEntryToggle(customLabel); > button.addActionListener(new ActionListener() { > public void actionPerformed(ActionEvent event) { > getPaletteViewer().setActiveTool(getToolEntry()); >@@ -408,7 +453,7 @@ > int layoutMode = getLayoutSetting(); > customLabel.setLayoutMode(layoutMode); > if (layoutMode == PaletteViewerPreferences.LAYOUT_COLUMNS) { >- customLabel.setBorder(COLUMNS_BORDER); >+ customLabel.setBorder(ICON_BORDER); > } else if (layoutMode == PaletteViewerPreferences.LAYOUT_LIST > || layoutMode == PaletteViewerPreferences.LAYOUT_DETAILS) { > customLabel.setBorder(LIST_BORDER); >@@ -478,17 +523,22 @@ > > static Rectangle getSelectionRectangle(int layoutMode, DetailedLabelFigure labelFigure) { > Rectangle rect = Rectangle.SINGLETON; >- rect.setBounds(labelFigure.getClientArea()); >+ rect.setBounds(labelFigure.getBounds()); > if (layoutMode == PaletteViewerPreferences.LAYOUT_LIST > || layoutMode == PaletteViewerPreferences.LAYOUT_DETAILS) { >- rect.x -= 5; >- rect.y -= 2; >- rect.width = labelFigure.getPreferredSize().width + 17; >- rect.height += 4; >+ >+ rect.x += PinnablePaletteStackFigure.ARROW_WIDTH; >+ rect.width -= PinnablePaletteStackFigure.ARROW_WIDTH; >+ int newWidth = labelFigure.getPreferredSize().width + 17; >+ if (newWidth < rect.width) { >+ rect.width = newWidth; >+ } >+ rect.crop(LIST_HIGHLIGHT_INSETS); > } else { >- rect.expand(2, 2); >+ rect.width -= PinnablePaletteStackFigure.ARROW_WIDTH; >+ rect.crop(ICON_HIGHLIGHT_INSETS); > } >- rect.intersect(labelFigure.getBounds().getExpanded(-1, -1)); > return rect; > } >+ > } >Index: src/org/eclipse/gef/internal/ui/palette/editparts/TemplateEditPart.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/TemplateEditPart.java,v >retrieving revision 1.17 >diff -u -r1.17 TemplateEditPart.java >--- src/org/eclipse/gef/internal/ui/palette/editparts/TemplateEditPart.java 10 Mar 2008 21:15:32 -0000 1.17 >+++ src/org/eclipse/gef/internal/ui/palette/editparts/TemplateEditPart.java 17 Apr 2008 18:07:39 -0000 >@@ -152,7 +152,7 @@ > int layoutMode = getLayoutSetting(); > fig.setLayoutMode(layoutMode); > if (layoutMode == PaletteViewerPreferences.LAYOUT_COLUMNS) { >- fig.setBorder(ToolEntryEditPart.COLUMNS_BORDER); >+ fig.setBorder(ToolEntryEditPart.ICON_BORDER); > } else if (layoutMode == PaletteViewerPreferences.LAYOUT_LIST > || layoutMode == PaletteViewerPreferences.LAYOUT_DETAILS) { > fig.setBorder(ToolEntryEditPart.LIST_BORDER); >Index: src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java,v >retrieving revision 1.16 >diff -u -r1.16 PaletteScrollBar.java >--- src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java 7 Apr 2008 20:26:35 -0000 1.16 >+++ src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java 17 Apr 2008 18:07:39 -0000 >@@ -52,7 +52,7 @@ > static { > Display display = Display.getCurrent(); > PaletteData pData = new PaletteData(0xFF, 0xFF00, 0xFF0000); >- RGB rgb = display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW).getRGB(); >+ RGB rgb = display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW).getRGB(); > int fillColor = pData.getPixel(rgb); > ImageData iData = new ImageData(1, 1, 24, pData); > iData.setPixel(0, 0, fillColor); >@@ -127,6 +127,7 @@ > } > }; > button.setRolloverEnabled(true); >+ button.setRequestFocusEnabled(false); > return button; > } > >Index: src/org/eclipse/gef/internal/ui/palette/PaletteColorUtil.java >=================================================================== >RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/PaletteColorUtil.java,v >retrieving revision 1.1 >diff -u -r1.1 PaletteColorUtil.java >--- src/org/eclipse/gef/internal/ui/palette/PaletteColorUtil.java 25 Feb 2008 21:33:15 -0000 1.1 >+++ src/org/eclipse/gef/internal/ui/palette/PaletteColorUtil.java 17 Apr 2008 18:07:39 -0000 >@@ -34,9 +34,11 @@ > > public static final Color INFO_FOREGROUND = ColorConstants.tooltipForeground; > >-private static final Color HOVER_COLOR = new Color(null, 254, 237, 205); >+public static final Color ARROW_HOVER = new Color(null, 229, 229, 219); > >-private static final Color SELECTED_COLOR = new Color(null, 224, 233, 246); >+private static final Color HOVER_COLOR = new Color(null, 252, 228, 179); >+ >+private static final Color SELECTED_COLOR = new Color(null, 207, 227, 250); > > private static final Color HOVER_COLOR_HICONTRAST = new Color(null, 0, 128, 0); >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
ahunter.eclipse
:
iplog+
Actions:
View
|
Diff
Attachments on
bug 227541
:
96435
|
96482
| 96483