diff options
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java index 9f0ac2c4ec..3f82e32523 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java @@ -355,15 +355,16 @@ long /*int*/ gtk_clicked (long /*int*/ widget) { GDK.gdk_event_get_button(eventPtr, eventButton); int eventType = GDK.gdk_event_get_event_type(eventPtr); int eventTime = GDK.gdk_event_get_time(eventPtr); - boolean GTK4_BUTTON_RELEASE = GTK.GTK4 && eventType == GDK.GDK4_BUTTON_RELEASE; - boolean GTK3_BUTTON_RELEASE = !GTK.GTK4 && eventType == GDK.GDK_BUTTON_RELEASE; - if (GTK4_BUTTON_RELEASE || GTK3_BUTTON_RELEASE) { - int clickTime = display.getDoubleClickTime (); - if (lastButton == eventButton[0] && lastTime != 0 && Math.abs (lastTime - eventTime) <= clickTime) { - doubleClick = true; + switch (eventType) { + case GDK.GDK_BUTTON_RELEASE: { + int clickTime = display.getDoubleClickTime (); + if (lastButton == eventButton[0] && lastTime != 0 && Math.abs (lastTime - eventTime) <= clickTime) { + doubleClick = true; + } + lastTime = eventTime == 0 ? 1: eventTime; + lastButton = eventButton[0]; + break; } - lastTime = eventTime == 0 ? 1: eventTime; - lastButton = eventButton[0]; } gdk_event_free (eventPtr); } @@ -374,16 +375,17 @@ long /*int*/ gtk_clicked (long /*int*/ widget) { @Override long /*int*/ gtk_event_after (long /*int*/ widget, long /*int*/ gdkEvent) { int eventType = GDK.gdk_event_get_event_type(gdkEvent); - boolean GTK4_BUTTON_PRESS = GTK.GTK4 && eventType == GDK.GDK4_BUTTON_PRESS; - boolean GTK3_BUTTON_PRESS = !GTK.GTK4 && eventType == GDK.GDK_BUTTON_PRESS; - if (GTK3_BUTTON_PRESS || GTK4_BUTTON_PRESS) { - int [] eventButton = new int [1]; - GDK.gdk_event_get_button(gdkEvent, eventButton); - double [] eventRX = new double [1]; - double [] eventRY = new double [1]; - GDK.gdk_event_get_root_coords(gdkEvent, eventRX, eventRY); - if (eventButton[0] == 3) { - parent.showMenu ((int) eventRX[0], (int) eventRY[0]); + switch (eventType) { + case GDK.GDK_BUTTON_PRESS: { + int [] eventButton = new int [1]; + GDK.gdk_event_get_button(gdkEvent, eventButton); + double [] eventRX = new double [1]; + double [] eventRY = new double [1]; + GDK.gdk_event_get_root_coords(gdkEvent, eventRX, eventRY); + if (eventButton[0] == 3) { + parent.showMenu ((int) eventRX[0], (int) eventRY[0]); + } + break; } } return 0; |