Skip to content

Commit

Permalink
7124313: [macosx] Swing Popups should overlap taskbar
Browse files Browse the repository at this point in the history
Reviewed-by: serb, dmarkov
  • Loading branch information
prsadhuk committed Jul 7, 2022
1 parent e05b2f2 commit 532a6ec
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
1 change: 0 additions & 1 deletion test/jdk/ProblemList.txt
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,6 @@ javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all
javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all
javax/swing/AbstractButton/6711682/bug6711682.java 8060765 windows-all,macosx-all
javax/swing/JFileChooser/6396844/TwentyThousandTest.java 8198003 generic-all
javax/swing/JPopupMenu/6580930/bug6580930.java 7124313 macosx-all
javax/swing/JPopupMenu/6800513/bug6800513.java 7184956 macosx-all
javax/swing/JTabbedPane/8007563/Test8007563.java 8051591 generic-all
javax/swing/JTabbedPane/4624207/bug4624207.java 8064922 macosx-all
Expand Down
17 changes: 13 additions & 4 deletions test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand All @@ -24,17 +24,26 @@
* @test
* @key headful
* @bug 6580930 7184956
* @requires (os.family != "mac")
* @summary Swing Popups should overlap taskbar
* @author Alexander Potochkin
* @library /lib/client
* @build ExtendedRobot
* @run main bug6580930
*/

import javax.swing.*;
import java.awt.*;
import java.awt.Dimension;
import java.awt.Point;
import java.awt.Insets;
import java.awt.Robot;
import java.awt.Toolkit;
import java.awt.Window;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import javax.swing.JFrame;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.SwingUtilities;

public class bug6580930 {
private static ExtendedRobot robot;
Expand Down

5 comments on commit 532a6ec

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb
Copy link
Member

@mrserb mrserb commented on 532a6ec Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk17u-dev

@mrserb
Copy link
Member

@mrserb mrserb commented on 532a6ec Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 532a6ec Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb Could not automatically backport 532a6ec7 to openjdk/jdk17u-dev due to conflicts in the following files:

  • test/jdk/ProblemList.txt

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-mrserb-532a6ec7-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 532a6ec7e3a048624b380b38b4611533a7caae18

# Backport the commit
$ git cherry-pick --no-commit 532a6ec7e3a048624b380b38b4611533a7caae18
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 532a6ec7e3a048624b380b38b4611533a7caae18'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport 532a6ec7e3a048624b380b38b4611533a7caae18.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 532a6ec7 from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 7 Jul 2022 and was reviewed by Sergey Bylokhov and Dmitry Markov.

Thanks!

@openjdk
Copy link

@openjdk openjdk bot commented on 532a6ec Jun 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb Could not automatically backport 532a6ec7 to openjdk/jdk11u-dev due to conflicts in the following files:

  • test/jdk/ProblemList.txt
  • test/jdk/javax/swing/JPopupMenu/6580930/bug6580930.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-mrserb-532a6ec7-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 532a6ec7e3a048624b380b38b4611533a7caae18

# Backport the commit
$ git cherry-pick --no-commit 532a6ec7e3a048624b380b38b4611533a7caae18
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 532a6ec7e3a048624b380b38b4611533a7caae18'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 532a6ec7e3a048624b380b38b4611533a7caae18.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 532a6ec7 from the openjdk/jdk repository.

The commit being backported was authored by Prasanta Sadhukhan on 7 Jul 2022 and was reviewed by Sergey Bylokhov and Dmitry Markov.

Thanks!

Please sign in to comment.