From 69a324224b1fa13f3394a56cda088bc8da15655a Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 10 Apr 2013 19:00:47 +0000 Subject: + Color changed for drop border, + removed pack in BKUSelectionComposite + using default background color as mainbar border color git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@81 174cde9d-5d70-4d2a-aa98-46368bc2aaf7 --- .../java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java | 3 ++- .../java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java | 2 +- .../src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'pdf-over-gui/src/main/java/at') diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index c59d50f9..a7a1b6aa 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java @@ -41,6 +41,7 @@ import at.asit.pdfover.signator.BKUs; */ public class BKUSelectionComposite extends StateComposite { + public static final int btnMargin = 2; /** * Listener for local bku selection @@ -151,7 +152,7 @@ public class BKUSelectionComposite extends StateComposite { btn_card.setImage(karte); - this.pack(); + //this.pack(); } @Override diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java index dffa38e7..fd466897 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java @@ -142,7 +142,7 @@ public class DataSourceSelectComposite extends StateComposite { Rectangle clientArea = DataSourceSelectComposite.this .drop_area.getClientArea(); - e.gc.setForeground(new Color(getDisplay(), 0x7E, 0x9F, 0xA5)); + e.gc.setForeground(new Color(getDisplay(),0x6B, 0xA5, 0xD9)); e.gc.setLineStyle(SWT.LINE_DASH); e.gc.drawRoundRectangle(clientArea.x, clientArea.y, clientArea.width - 2, clientArea.height - 2, diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java index a3e95e23..32b44a78 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java @@ -85,7 +85,8 @@ public abstract class MainBarButton extends Canvas { this.activeBackground = new Color(getDisplay(),0xB4, 0xCD, 0xEC); //this.textColor = this.getForeground(); this.textColor = new Color(getDisplay(), 0x00, 0x00, 0x00); - this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9); + //this.borderColor = new Color(getDisplay(), 0xf9, 0xf9, 0xf9); + this.borderColor = this.getBackground(); this.inactiveText = new Color(getDisplay(), 0x40, 0x40, 0x40); this.textsize = StateComposite.TEXT_SIZE_BUTTON; -- cgit v1.2.3