Attachment #95103 for bug #223712

View | Details | Raw Unified | Return to bug 223712
Collapse All | Expand All

Lines 13-18 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/PinFigure.java (-1 / +7 lines)
13		13
14	import org.eclipse.swt.graphics.Color;	14	import org.eclipse.swt.graphics.Color;
15		15
		16	import org.eclipse.draw2d.Border;
16	import org.eclipse.draw2d.ButtonModel;	17	import org.eclipse.draw2d.ButtonModel;
17	import org.eclipse.draw2d.ChangeEvent;	18	import org.eclipse.draw2d.ChangeEvent;
18	import org.eclipse.draw2d.ChangeListener;	19	import org.eclipse.draw2d.ChangeListener;
Lines 20-25 Link Here
20	import org.eclipse.draw2d.Graphics;	21	import org.eclipse.draw2d.Graphics;
21	import org.eclipse.draw2d.ImageFigure;	22	import org.eclipse.draw2d.ImageFigure;
22	import org.eclipse.draw2d.Label;	23	import org.eclipse.draw2d.Label;
		24	import org.eclipse.draw2d.MarginBorder;
23	import org.eclipse.draw2d.Toggle;	25	import org.eclipse.draw2d.Toggle;
24		26
25	import org.eclipse.gef.internal.InternalImages;	27	import org.eclipse.gef.internal.InternalImages;
Lines 39-49 Link Here
39	PaletteColorUtil.WIDGET_LIST_BACKGROUND,	41	PaletteColorUtil.WIDGET_LIST_BACKGROUND,
40	PaletteColorUtil.WIDGET_NORMAL_SHADOW, 0.60);	42	PaletteColorUtil.WIDGET_NORMAL_SHADOW, 0.60);
41		43
		44	private static final Border TOOLTIP_BORDER = new MarginBorder(0, 2, 1, 0);
		45
42	public PinFigure() {	46	public PinFigure() {
43	super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));	47	super(new ImageFigure(InternalImages.get(InternalImages.IMG_UNPINNED)));
44	setRolloverEnabled(true);	48	setRolloverEnabled(true);
45	setRequestFocusEnabled(false);	49	setRequestFocusEnabled(false);
46	setToolTip(new Label(PaletteMessages.TOOLTIP_PIN_FIGURE));	50	Label tooltip = new Label(PaletteMessages.TOOLTIP_PIN_FIGURE);
		51	tooltip.setBorder(TOOLTIP_BORDER);
		52	setToolTip(tooltip);
47	setOpaque(false);	53	setOpaque(false);
48		54
49	addChangeListener(new ChangeListener() {	55	addChangeListener(new ChangeListener() {




                    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);
            }
        }
        
	}
	




 *******************************************************************************/
package org.eclipse.gef.internal.ui.palette.editparts;

import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.PaletteData;

static {
	Display display = Display.getCurrent();
	PaletteData pData = new PaletteData(0xFF, 0xFF00, 0xFF0000);
    RGB rgb = display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW).getRGB();
	int fillColor = pData.getPixel(rgb);
	ImageData iData = new ImageData(1, 1, 24, pData);
	iData.setPixel(0, 0, fillColor);
	iData.setAlpha(0, 0, 200);
	TRANSPARENCY = new Image(display, iData);
	
	// TODO: Should I use the Button width here?
	OUTER_DOWN_TRIANGLE.addPoint(new Point(34, 2));
	OUTER_DOWN_TRIANGLE.addPoint(new Point(38, 6));
	OUTER_DOWN_TRIANGLE.addPoint(new Point(42, 2));




		rects[0] = sash.getBounds();
		tracker.setCursor(SharedCursors.SIZEE);
		tracker.setRectangles(rects);
		tracker.setStippled(true);
		if (tracker.open()) {
			int deltaX = sash.getBounds().x - tracker.getRectangles()[0].x;
			if (dock == PositionConstants.WEST)

			return;
		
		Rectangle area = getClientArea();
	    boolean buttonVisible = button.getVisible();
		Point titleSize = title.computeSize(-1, -1);
        Point buttonSize = buttonVisible ? button.computeSize(-1, -1)
            : new Point(0, 0);
		cachedTitleHeight = Math.max(titleSize.y, buttonSize.y);
		if (buttonVisible) {
		    buttonSize.x = Math.max(cachedTitleHeight, buttonSize.x);
		}
		if (dock == PositionConstants.EAST) {
			int buttonX = area.width - buttonSize.x;
			button.setBounds(buttonX, 0, buttonSize.x, cachedTitleHeight);
			title.setBounds(0, 0, buttonX, cachedTitleHeight);
		} else {
			int titleX = buttonSize.x;
			button.setBounds(0, 0, buttonSize.x, cachedTitleHeight);
			title.setBounds(titleX, 0, area.width - titleX, cachedTitleHeight);
				title.setBounds(titleX, 0, area.width - titleX, cachedTitleHeight);
			}
			area.y += cachedTitleHeight;
			area.height -= cachedTitleHeight;
		}
		area.y += cachedTitleHeight;
		area.height -= cachedTitleHeight;
		pCtrl.setBounds(area);
	}
	protected void updateState() {
		title.setVisible(isInState(STATE_EXPANDED) || isInState(STATE_PINNED_OPEN));
		button.setVisible(isInState(STATE_PINNED_OPEN));
		if (transferFocus && button.getVisible()) {
			transferFocus = false;

Return to bug 223712

Lines 289-294 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/ToolEntryEditPart.java (+20 lines)
289	getLayoutSetting(), customLabel), 3, 3);	289	getLayoutSetting(), customLabel), 3, 3);
290	}	290	}
291	}	291	}
		292	protected void paintBorder(Graphics graphics) {
		293	if (!isToolbarItem() && isEnabled()) {
		294
		295	if (getBorder() != null)
		296	getBorder().paint(this, graphics, NO_INSETS);
		297	if (hasFocus()) {
		298	graphics.setForegroundColor(ColorConstants.black);
		299	graphics.setBackgroundColor(ColorConstants.white);
		300
		301	Rectangle area = getSelectionRectangle(
		302	getLayoutSetting(), customLabel);
		303	if (isStyle(STYLE_BUTTON))
		304	graphics.drawFocus(area.x, area.y, area.width, area.height);
		305	else
		306	graphics.drawFocus(area.x, area.y, area.width - 1, area.height - 1);
		307	}
		308	} else {
		309	super.paintBorder(graphics);
		310	}
		311	}
292		312
293	}	313	}
294		314

Lines 839-845 Link Here

(-)src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java (-22 / +18 lines)
839	rects[0] = sash.getBounds();	839	rects[0] = sash.getBounds();
840	tracker.setCursor(SharedCursors.SIZEE);	840	tracker.setCursor(SharedCursors.SIZEE);
841	tracker.setRectangles(rects);	841	tracker.setRectangles(rects);
842	tracker.setStippled(true);
843	if (tracker.open()) {	842	if (tracker.open()) {
844	int deltaX = sash.getBounds().x - tracker.getRectangles()[0].x;	843	int deltaX = sash.getBounds().x - tracker.getRectangles()[0].x;
845	if (dock == PositionConstants.WEST)	844	if (dock == PositionConstants.WEST)
Lines 994-1024 Link Here
994	return;	993	return;
995		994
996	Rectangle area = getClientArea();	995	Rectangle area = getClientArea();
997	if (title.getVisible()) {	996	boolean buttonVisible = button.getVisible();
998	boolean buttonVisible = button.getVisible();	997	Point titleSize = title.computeSize(-1, -1);
999	Point titleSize = title.computeSize(-1, -1);	998	Point buttonSize = buttonVisible ? button.computeSize(-1, -1)
1000	Point buttonSize = buttonVisible ? button.computeSize(-1, -1)	999	: new Point(0, 0);
1001	: new Point(0, 0);	1000	cachedTitleHeight = Math.max(titleSize.y, buttonSize.y);
1002	cachedTitleHeight = Math.max(titleSize.y, buttonSize.y);	1001	if (buttonVisible) {
1003	if (buttonVisible) {	1002	buttonSize.x = Math.max(cachedTitleHeight, buttonSize.x);
1004	buttonSize.x = Math.max(cachedTitleHeight, buttonSize.x);	1003	}
1005	}	1004	if (dock == PositionConstants.EAST) {
1006	if (dock == PositionConstants.EAST) {	1005	int buttonX = area.width - buttonSize.x;
1007	int buttonX = area.width - buttonSize.x;	1006	button.setBounds(buttonX, 0, buttonSize.x, cachedTitleHeight);
1008	button.setBounds(buttonX, 0, buttonSize.x, cachedTitleHeight);	1007	title.setBounds(0, 0, buttonX, cachedTitleHeight);
1009	title.setBounds(0, 0, buttonX, cachedTitleHeight);	1008	} else {
1010	} else {	1009	int titleX = buttonSize.x;
1011	int titleX = buttonSize.x;	1010	button.setBounds(0, 0, buttonSize.x, cachedTitleHeight);
1012	button.setBounds(0, 0, buttonSize.x, cachedTitleHeight);	1011	title.setBounds(titleX, 0, area.width - titleX, cachedTitleHeight);
1013	title.setBounds(titleX, 0, area.width - titleX, cachedTitleHeight);
1014	}
1015	area.y += cachedTitleHeight;
1016	area.height -= cachedTitleHeight;
1017	}	1012	}
		1013	area.y += cachedTitleHeight;
		1014	area.height -= cachedTitleHeight;
1018	pCtrl.setBounds(area);	1015	pCtrl.setBounds(area);
1019	}	1016	}
1020	protected void updateState() {	1017	protected void updateState() {
1021	title.setVisible(isInState(STATE_EXPANDED) \|\| isInState(STATE_PINNED_OPEN));
1022	button.setVisible(isInState(STATE_PINNED_OPEN));	1018	button.setVisible(isInState(STATE_PINNED_OPEN));
1023	if (transferFocus && button.getVisible()) {	1019	if (transferFocus && button.getVisible()) {
1024	transferFocus = false;	1020	transferFocus = false;

Lines 10-15 Link Here

(-)src/org/eclipse/gef/internal/ui/palette/editparts/PaletteScrollBar.java (-3 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.gef.internal.ui.palette.editparts;	11	package org.eclipse.gef.internal.ui.palette.editparts;
12		12
		13	import org.eclipse.swt.SWT;
13	import org.eclipse.swt.graphics.Image;	14	import org.eclipse.swt.graphics.Image;
14	import org.eclipse.swt.graphics.ImageData;	15	import org.eclipse.swt.graphics.ImageData;
15	import org.eclipse.swt.graphics.PaletteData;	16	import org.eclipse.swt.graphics.PaletteData;
Lines 51-64 Link Here
51	static {	52	static {
52	Display display = Display.getCurrent();	53	Display display = Display.getCurrent();
53	PaletteData pData = new PaletteData(0xFF, 0xFF00, 0xFF0000);	54	PaletteData pData = new PaletteData(0xFF, 0xFF00, 0xFF0000);
54	RGB rgb = PaletteColorUtil.INFO_FOREGROUND.getRGB();	55	RGB rgb = display.getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW).getRGB();
55	int fillColor = pData.getPixel(rgb);	56	int fillColor = pData.getPixel(rgb);
56	ImageData iData = new ImageData(1, 1, 24, pData);	57	ImageData iData = new ImageData(1, 1, 24, pData);
57	iData.setPixel(0, 0, fillColor);	58	iData.setPixel(0, 0, fillColor);
58	iData.setAlpha(0, 0, 15); // 6% transparent -- 255 * 0.06	59	iData.setAlpha(0, 0, 200);
59	TRANSPARENCY = new Image(display, iData);	60	TRANSPARENCY = new Image(display, iData);
60		61
61	// TODO: Should I use the Button width here?
62	OUTER_DOWN_TRIANGLE.addPoint(new Point(34, 2));	62	OUTER_DOWN_TRIANGLE.addPoint(new Point(34, 2));
63	OUTER_DOWN_TRIANGLE.addPoint(new Point(38, 6));	63	OUTER_DOWN_TRIANGLE.addPoint(new Point(38, 6));
64	OUTER_DOWN_TRIANGLE.addPoint(new Point(42, 2));	64	OUTER_DOWN_TRIANGLE.addPoint(new Point(42, 2));