diff options
author | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:22 +0000 |
---|---|---|
committer | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:22 +0000 |
commit | 6d14f1c0104e294e02ade3f23988832bcecf4735 (patch) | |
tree | 6e71a84dd62f8d4637f24292a26fe5820822f393 /trunk/pdf-over-gui | |
parent | 7f689084bc2204ac58bc49a077f0adcdf4151afb (diff) | |
download | pdf-over-6d14f1c0104e294e02ade3f23988832bcecf4735.tar.gz pdf-over-6d14f1c0104e294e02ade3f23988832bcecf4735.tar.bz2 pdf-over-6d14f1c0104e294e02ade3f23988832bcecf4735.zip |
+ Color changed for drop border,
+ removed pack in BKUSelectionComposite
+ using default background color as mainbar border color
git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12667 3a0b52a2-8410-0410-bc02-ff6273a87459
Diffstat (limited to 'trunk/pdf-over-gui')
3 files changed, 5 insertions, 3 deletions
diff --git a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java index c59d50f9..a7a1b6aa 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java +++ b/trunk/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/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java index dffa38e7..fd466897 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/DataSourceSelectComposite.java +++ b/trunk/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/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java b/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java index a3e95e23..32b44a78 100644 --- a/trunk/pdf-over-gui/src/main/java/at/asit/pdfover/gui/controls/MainBarButton.java +++ b/trunk/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; |