infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-16 19:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

8014503: AWT Choice implementation should be made consistent across platforms

Browse Source 
Reviewed-by: serb, aghaisas, sveerabhadra
This commit is contained in:
Krishna Addepalli 2018-10-09 12:08:59 +05:30
parent 995f6963b3
commit 0caefc787f
3 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java.desktop/macosx/classes/sun/lwawt/LWChoicePeer.java
View File

@ -23,16 +23,19 @@
* questions.
*/
package sun.lwawt;
import java.awt.*;
import java.awt.Point;
import java.awt.Choice;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.peer.ChoicePeer;
import javax.accessibility.Accessible;
import javax.swing.*;
import javax.swing.JComboBox;
import javax.swing.SwingUtilities;
import javax.swing.JPopupMenu;
/**
* Lightweight implementation of {@link ChoicePeer}. Delegates most of the work
@ -146,19 +149,6 @@ final class LWChoicePeer extends LWComponentPeer<Choice, JComboBox<String>>
return LWChoicePeer.this.getLocationOnScreen();
}
/**
* We should post ITEM_STATE_CHANGED event when the same element is
* reselected.
*/
@Override
public void setSelectedItem(final Object anObject) {
final Object oldSelection = selectedItemReminder;
if (oldSelection != null && oldSelection.equals(anObject)) {
selectedItemChanged();
}
super.setSelectedItem(anObject);
}
@Override
public void firePopupMenuWillBecomeVisible() {
super.firePopupMenuWillBecomeVisible();

70
src/java.desktop/unix/classes/sun/awt/X11/XChoicePeer.java
View File

@ -25,9 +25,29 @@
package sun.awt.X11;
import java.awt.*;
import java.awt.peer.*;
import java.awt.event.*;
import java.awt.Color;
import java.awt.Insets;
import java.awt.Point;
import java.awt.FontMetrics;
import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.Choice;
import java.awt.Toolkit;
import java.awt.Graphics;
import java.awt.Component;
import java.awt.AWTEvent;
import java.awt.Insets;
import java.awt.Font;
import java.awt.peer.ChoicePeer;
import java.awt.event.FocusEvent;
import java.awt.event.InvocationEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseWheelEvent;
import java.awt.event.KeyEvent;
import java.awt.event.ItemEvent;
import sun.util.logging.PlatformLogger;
// FIXME: tab traversal should be disabled when mouse is captured (4816336)
@ -228,12 +248,14 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
helper.down();
int newIdx = helper.getSelectedIndex();
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
repaint();
if (((Choice)target).getSelectedIndex() != newIdx) {
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
repaint();
}
}
break;
}
@ -243,12 +265,14 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
helper.up();
int newIdx = helper.getSelectedIndex();
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
repaint();
if (((Choice)target).getSelectedIndex() != newIdx) {
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
repaint();
}
}
break;
}
@ -293,11 +317,13 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
helper.select(dragStartIdx);
} else { //KeyEvent.VK_ENTER:
int newIdx = helper.getSelectedIndex();
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
if (newIdx != (((Choice)target).getSelectedIndex())) {
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),
ItemEvent.SELECTED));
}
}
}
hidePopdownMenu();
@ -457,8 +483,10 @@ public final class XChoicePeer extends XComponentPeer implements ChoicePeer, Top
* We should generate ItemEvent if only
* LeftMouseButton used */
if (e.getButton() == MouseEvent.BUTTON1 &&
(!firstPress || wasDragged ))
(!firstPress || wasDragged ) &&
((Choice)target).getSelectedIndex() != newIdx)
{
((Choice)target).select(newIdx);
postEvent(new ItemEvent((Choice)target,
ItemEvent.ITEM_STATE_CHANGED,
((Choice)target).getItem(newIdx),

2
test/jdk/java/awt/Choice/SelectCurrentItemTest/SelectCurrentItemTest.java
View File

@ -108,7 +108,7 @@ public class SelectCurrentItemTest implements ItemListener, WindowListener {
robot.delay(1000);
robot.mouseMove(loc.x + size.width / 2, loc.y + size.height + size.height / 2);
robot.mouseMove(loc.x + size.width / 2, loc.y + size.height);
robot.mousePress(InputEvent.BUTTON1_MASK);
robot.mouseRelease(InputEvent.BUTTON1_MASK);
robot.waitForIdle();