Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

PopupMenu: make sure that popup menu does not overlap any operating system task bar (issue #701)

Browse Source
This commit is contained in:
Karl Tauber
2023-07-31 22:21:35 +02:00
parent dfe4404a17
commit b47ed94f40
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -38,6 +38,8 @@ FlatLaf Change Log
- FormattedTextField: On Linux, fixed `IllegalArgumentException: Invalid
location` if `JFormattedTextField.setDocument()` is invoked in a focus gained
listener on that formatted text field. (issue #698)
- PopupMenu: Make sure that popup menu does not overlap any operating system
task bar. (issue #701)
#### Incompatibilities

23
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupMenuUI.java
View File

@@ -193,27 +193,38 @@ public class FlatPopupMenuUI
@Override
public Popup getPopup( JPopupMenu popup, int x, int y ) {
Dimension popupSize = popup.getPreferredSize();
Rectangle screenBounds = getScreenBoundsAt( x, y );
// make sure that popup does not overlap any task/side bar
if( x + popupSize.width > screenBounds.x + screenBounds.width )
x = screenBounds.x + screenBounds.width - popupSize.width;
if( y + popupSize.height > screenBounds.y + screenBounds.height )
y = screenBounds.y + screenBounds.height - popupSize.height;
if( x < screenBounds.x )
x = screenBounds.x;
if( y < screenBounds.y )
y = screenBounds.y;
// do not add scroller to combobox popups or to popups that already have a scroll pane
if( popup instanceof BasicComboPopup ||
(popup.getComponentCount() > 0 && popup.getComponent( 0 ) instanceof JScrollPane) )
return super.getPopup( popup, x, y );
// do not add scroller if popup fits into screen
Dimension prefSize = popup.getPreferredSize();
int screenHeight = getScreenHeightAt( x, y );
if( prefSize.height <= screenHeight )
if( popupSize.height <= screenBounds.height )
return super.getPopup( popup, x, y );
// create scroller
FlatPopupScroller scroller = new FlatPopupScroller( popup );
scroller.setPreferredSize( new Dimension( prefSize.width, screenHeight ) );
scroller.setPreferredSize( new Dimension( popupSize.width, screenBounds.height ) );
// create popup
PopupFactory popupFactory = PopupFactory.getSharedInstance();
return popupFactory.getPopup( popup.getInvoker(), scroller, x, y );
}
private int getScreenHeightAt( int x, int y ) {
private Rectangle getScreenBoundsAt( int x, int y ) {
// find GraphicsConfiguration at popup location (similar to JPopupMenu.getCurrentGraphicsConfiguration())
GraphicsConfiguration gc = null;
for( GraphicsDevice device : GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices() ) {
@@ -234,7 +245,7 @@ public class FlatPopupMenuUI
Toolkit toolkit = Toolkit.getDefaultToolkit();
Rectangle screenBounds = (gc != null) ? gc.getBounds() : new Rectangle( toolkit.getScreenSize() );
Insets screenInsets = Toolkit.getDefaultToolkit().getScreenInsets( gc );
return screenBounds.height - screenInsets.top - screenInsets.bottom;
return FlatUIUtils.subtractInsets( screenBounds, screenInsets );
}
//---- class FlatPopupMenuLayout ------------------------------------------