You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/11/23 07:51:23 UTC
[incubator-hop] branch master updated: Use SWT.PUSH instead of
SWT.CASCADE for a menuitem w/o a submenu (#405)
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new b9d8dad Use SWT.PUSH instead of SWT.CASCADE for a menuitem w/o a submenu (#405)
b9d8dad is described below
commit b9d8dadfdbdde8185525f473ee205b18250c41fd
Author: Hiromu Hota <hi...@gmail.com>
AuthorDate: Sun Nov 22 23:51:14 2020 -0800
Use SWT.PUSH instead of SWT.CASCADE for a menuitem w/o a submenu (#405)
As reported here (https://bugs.eclipse.org/bugs/show_bug.cgi?id=569046),
a menuitem with SWT.CASCADE w/o a submenu is NOT clickable on RAP/RWT.
---
.../apache/hop/ui/core/widget/ConditionEditor.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java b/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java
index bbb62cf..e467f91 100644
--- a/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java
+++ b/ui/src/main/java/org/apache/hop/ui/core/widget/ConditionEditor.java
@@ -509,7 +509,7 @@ public class ConditionEditor extends Composite {
switch ( area ) {
case AREA_NOT:
mPop = new Menu( widget );
- MenuItem miNegate = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miNegate = new MenuItem( mPop, SWT.PUSH );
miNegate.setText( BaseMessages.getString( PKG, "ConditionEditor.NegateCondition" ) );
miNegate.addSelectionListener( new SelectionAdapter() {
@Override
@@ -524,7 +524,7 @@ public class ConditionEditor extends Composite {
case AREA_BACKGROUND:
case AREA_ICON_ADD:
mPop = new Menu( widget );
- MenuItem miAdd = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miAdd = new MenuItem( mPop, SWT.PUSH );
miAdd.setText( BaseMessages.getString( PKG, "ConditionEditor.AddCondition.Label" ) );
miAdd.addSelectionListener( new SelectionAdapter() {
@Override
@@ -536,7 +536,7 @@ public class ConditionEditor extends Composite {
break;
case AREA_SUBCONDITION:
mPop = new Menu( widget );
- MenuItem miEdit = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miEdit = new MenuItem( mPop, SWT.PUSH );
miEdit.setText( BaseMessages.getString( PKG, "ConditionEditor.EditCondition.Label" ) );
miEdit.addSelectionListener( new SelectionAdapter() {
@Override
@@ -546,7 +546,7 @@ public class ConditionEditor extends Composite {
widget.redraw();
}
} );
- MenuItem miDel = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miDel = new MenuItem( mPop, SWT.PUSH );
miDel.setText( BaseMessages.getString( PKG, "ConditionEditor.DeleteCondition.Label" ) );
miDel.addSelectionListener( new SelectionAdapter() {
@Override
@@ -559,7 +559,7 @@ public class ConditionEditor extends Composite {
// Add a sub-condition in the subcondition... (move down)
final Condition sub = activeCondition.getCondition( cond_nr );
if ( sub.getLeftValuename() != null ) {
- miAdd = new MenuItem( mPop, SWT.CASCADE );
+ miAdd = new MenuItem( mPop, SWT.PUSH );
miAdd.setText( BaseMessages.getString( PKG, "ConditionEditor.AddSubCondition.Label" ) );
miAdd.addSelectionListener( new SelectionAdapter() {
@Override
@@ -575,7 +575,7 @@ public class ConditionEditor extends Composite {
// --------------------------------------------------
new MenuItem( mPop, SWT.SEPARATOR );
- MenuItem miCopy = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miCopy = new MenuItem( mPop, SWT.PUSH );
miCopy.setText( BaseMessages.getString( PKG, "ConditionEditor.CopyToClipboard" ) );
miCopy.addSelectionListener( new SelectionAdapter() {
@Override
@@ -591,7 +591,7 @@ public class ConditionEditor extends Composite {
}
} );
- MenuItem miPasteBef = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miPasteBef = new MenuItem( mPop, SWT.PUSH );
miPasteBef.setText( BaseMessages.getString( PKG, "ConditionEditor.PasteFromClipboardBeforeCondition" ) );
miPasteBef.addSelectionListener( new SelectionAdapter() {
@Override
@@ -618,7 +618,7 @@ public class ConditionEditor extends Composite {
// --------------------------------------------------
new MenuItem( mPop, SWT.SEPARATOR );
- MenuItem miPasteAft = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miPasteAft = new MenuItem( mPop, SWT.PUSH );
miPasteAft.setText( BaseMessages.getString( PKG, "ConditionEditor.PasteFromClipboardAfterCondition" ) );
miPasteAft.addSelectionListener( new SelectionAdapter() {
@Override
@@ -644,7 +644,7 @@ public class ConditionEditor extends Composite {
} );
// --------------------------------------------------
new MenuItem( mPop, SWT.SEPARATOR );
- MenuItem miMoveSub = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miMoveSub = new MenuItem( mPop, SWT.PUSH );
miMoveSub.setText( BaseMessages.getString( PKG, "ConditionEditor.MoveConditionToSubCondition" ) );
miMoveSub.addSelectionListener( new SelectionAdapter() {
@Override
@@ -661,7 +661,7 @@ public class ConditionEditor extends Composite {
widget.redraw();
}
} );
- MenuItem miMoveParent = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miMoveParent = new MenuItem( mPop, SWT.PUSH );
miMoveParent.setText( BaseMessages.getString( PKG, "ConditionEditor.MoveConditionToParentCondition" ) );
if ( getLevel() == 0 ) {
miMoveParent.setEnabled( false );
@@ -685,7 +685,7 @@ public class ConditionEditor extends Composite {
} );
// --------------------------------------------------
new MenuItem( mPop, SWT.SEPARATOR );
- MenuItem miMoveDown = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miMoveDown = new MenuItem( mPop, SWT.PUSH );
miMoveDown.setText( BaseMessages.getString( PKG, "ConditionEditor.MoveConditionDown" ) );
if ( cond_nr >= activeCondition.nrConditions() - 1 ) {
miMoveDown.setEnabled( false );
@@ -700,7 +700,7 @@ public class ConditionEditor extends Composite {
widget.redraw();
}
} );
- MenuItem miMoveUp = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miMoveUp = new MenuItem( mPop, SWT.PUSH );
miMoveUp.setText( BaseMessages.getString( PKG, "ConditionEditor.MoveConditionUp" ) );
if ( cond_nr == 0 ) {
miMoveUp.setEnabled( false );
@@ -721,7 +721,7 @@ public class ConditionEditor extends Composite {
break;
case AREA_OPERATOR:
Menu mPop = new Menu( widget );
- MenuItem miDown = new MenuItem( mPop, SWT.CASCADE );
+ MenuItem miDown = new MenuItem( mPop, SWT.PUSH );
miDown.setText( BaseMessages.getString( PKG, "ConditionEditor.MoveDown" ) );
miDown.addSelectionListener( new SelectionAdapter() {
@Override