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

JIDE: use FlatLaf menu scrolling for JidePopupMenu (issue #225)

Browse Source
This commit is contained in:
Karl Tauber
2022-03-14 12:23:52 +01:00
parent fef6ae7ff7
commit d487c3b005
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJidePopupMenuUI.java
View File

@@ -20,7 +20,6 @@ import javax.swing.*;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import com.formdev.flatlaf.ui.FlatPopupMenuUI; import com.formdev.flatlaf.ui.FlatPopupMenuUI;
import com.jidesoft.plaf.LookAndFeelFactory; import com.jidesoft.plaf.LookAndFeelFactory;
import com.jidesoft.plaf.basic.BasicJidePopupMenuUI;
/** /**
* Provides the Flat LaF UI delegate for {@link com.jidesoft.swing.JidePopupMenu}. * Provides the Flat LaF UI delegate for {@link com.jidesoft.swing.JidePopupMenu}.
@@ -38,7 +37,9 @@ public class FlatJidePopupMenuUI
@Override @Override
public Popup getPopup( JPopupMenu popupMenu, int x, int y ) { public Popup getPopup( JPopupMenu popupMenu, int x, int y ) {
Popup popup = BasicJidePopupMenuUI.addScrollPaneIfNecessary( popupMenu, x, y ); // not using BasicJidePopupMenuUI.addScrollPaneIfNecessary() anymore because
return popup == null ? super.getPopup( popupMenu, x, y ) : popup; // FlatLaf supports menu scrolling that works better than JIDE menu scrolling
// (support mouse wheel scrolling, scales arrows)
return super.getPopup( popupMenu, x, y );
} }
} }