diff options
author | Xi Yan | 2018-10-11 13:52:16 +0000 |
---|---|---|
committer | Xi Yan | 2018-10-18 13:29:27 +0000 |
commit | e6549a8c732a29600409dd57282157bdf7a7fb5a (patch) | |
tree | d957af00807389181ed76f2f7c8d073aedfe2da0 /examples/org.eclipse.swt.examples | |
parent | f2c989edceb3846426bca539c39f79e306ac85c8 (diff) | |
download | eclipse.platform.swt-e6549a8c732a29600409dd57282157bdf7a7fb5a.tar.gz eclipse.platform.swt-e6549a8c732a29600409dd57282157bdf7a7fb5a.tar.xz eclipse.platform.swt-e6549a8c732a29600409dd57282157bdf7a7fb5a.zip |
Bug 267981 - SWT.Border Checkbox not working in ControlExample for the
DateTime Widget
Reverting border-related changes as per comment 6. Bump version to
3.106.300 for SWT examples.
Change-Id: I5dbe39b06ecb1d6277dd445639b508d6cf3140ca
Signed-off-by: Xi Yan <xixiyan@redhat.com>
Diffstat (limited to 'examples/org.eclipse.swt.examples')
9 files changed, 11 insertions, 9 deletions
diff --git a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF index bec6d5d35d..640f6bde2a 100644 --- a/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.swt.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.SWTStandaloneExampleSet.name Bundle-SymbolicName: org.eclipse.swt.examples; singleton:=true -Bundle-Version: 3.106.200.qualifier +Bundle-Version: 3.106.300.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/examples/org.eclipse.swt.examples/pom.xml b/examples/org.eclipse.swt.examples/pom.xml index 873b57434f..fbd709eebe 100644 --- a/examples/org.eclipse.swt.examples/pom.xml +++ b/examples/org.eclipse.swt.examples/pom.xml @@ -19,6 +19,6 @@ </parent> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.examples</artifactId> - <version>3.106.200-SNAPSHOT</version> + <version>3.106.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java index bfa24127f8..3852db97fa 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ButtonTab.java @@ -255,6 +255,6 @@ class ButtonTab extends AlignableTab { arrowButton.setSelection ((button1.getStyle () & SWT.ARROW) != 0); flatButton.setSelection ((button1.getStyle () & SWT.FLAT) != 0); wrapButton.setSelection ((button1.getStyle () & SWT.WRAP) != 0); - borderButton.setEnabled(false); + borderButton.setSelection ((button1.getStyle () & SWT.BORDER) != 0); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DateTimeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DateTimeTab.java index fae9a9bb37..66fd02ed39 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DateTimeTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/DateTimeTab.java @@ -66,6 +66,7 @@ class DateTimeTab extends Tab { if (mediumButton.getSelection ()) style |= SWT.MEDIUM; if (longButton.getSelection ()) style |= SWT.LONG; if (dropDownButton.getSelection ()) style |= SWT.DROP_DOWN; + if (borderButton.getSelection ()) style |= SWT.BORDER; if (weekNumbersButton.getSelection ()) style |= SWT.CALENDAR_WEEKNUMBERS; /* Create the example widgets */ @@ -160,6 +161,6 @@ class DateTimeTab extends Tab { weekNumbersButton.setEnabled(false); weekNumbersButton.setSelection(false); } - borderButton.setEnabled(false); + borderButton.setSelection ((dateTime1.getStyle () & SWT.BORDER) != 0); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ExpandBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ExpandBarTab.java index 98ba67f1fc..5753f0ae67 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ExpandBarTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ExpandBarTab.java @@ -157,7 +157,7 @@ class ExpandBarTab extends Tab { Widget [] widgets = getExampleWidgets (); if (widgets.length != 0){ verticalButton.setSelection ((widgets [0].getStyle () & SWT.V_SCROLL) != 0); - borderButton.setEnabled(false); + borderButton.setSelection ((widgets [0].getStyle () & SWT.BORDER) != 0); } } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java index ff5c1a66d6..3e414a7e69 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/GroupTab.java @@ -82,6 +82,7 @@ class GroupTab extends Tab { if (shadowInButton.getSelection ()) style |= SWT.SHADOW_IN; if (shadowOutButton.getSelection ()) style |= SWT.SHADOW_OUT; if (shadowNoneButton.getSelection ()) style |= SWT.SHADOW_NONE; + if (borderButton.getSelection ()) style |= SWT.BORDER; /* Create the example widgets */ group1 = new Group (groupGroup, style); @@ -158,7 +159,7 @@ class GroupTab extends Tab { shadowInButton.setSelection ((group1.getStyle () & SWT.SHADOW_IN) != 0); shadowOutButton.setSelection ((group1.getStyle () & SWT.SHADOW_OUT) != 0); shadowNoneButton.setSelection ((group1.getStyle () & SWT.SHADOW_NONE) != 0); - borderButton.setEnabled(false); + borderButton.setSelection ((group1.getStyle () & SWT.BORDER) != 0); if (!instance.startup) setTitleText (); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java index 136a200a57..c77254340b 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/RangeTab.java @@ -160,7 +160,7 @@ abstract class RangeTab extends Tab { horizontalButton.setSelection ((widgets [0].getStyle () & SWT.HORIZONTAL) != 0); verticalButton.setSelection ((widgets [0].getStyle () & SWT.VERTICAL) != 0); } - borderButton.setEnabled(false); + borderButton.setSelection ((widgets [0].getStyle () & SWT.BORDER) != 0); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TabFolderTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TabFolderTab.java index ccb63a537d..1f21957b9f 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TabFolderTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/TabFolderTab.java @@ -181,6 +181,6 @@ class TabFolderTab extends Tab { super.setExampleWidgetState (); topButton.setSelection ((tabFolder1.getStyle () & SWT.TOP) != 0); bottomButton.setSelection ((tabFolder1.getStyle () & SWT.BOTTOM) != 0); - borderButton.setEnabled(false); + borderButton.setSelection ((tabFolder1.getStyle () & SWT.BORDER) != 0); } } diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java index a2520b1884..d3633c60ad 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ToolBarTab.java @@ -335,7 +335,7 @@ class ToolBarTab extends Tab { wrapButton.setSelection ((imageToolBar.getStyle () & SWT.WRAP) != 0); shadowOutButton.setSelection ((imageToolBar.getStyle () & SWT.SHADOW_OUT) != 0); rightButton.setSelection ((imageToolBar.getStyle () & SWT.RIGHT) != 0); - borderButton.setEnabled(false); + borderButton.setSelection ((imageToolBar.getStyle () & SWT.BORDER) != 0); } /** |