mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2025-12-06 14:00:55 +03:00
ToolBar: fixed endless loop if button in Toolbar has focus and is made invisible (issue #884)
Some checks failed
CI / build (11, ) (push) Has been cancelled
CI / build (17, ) (push) Has been cancelled
CI / build (21, ) (push) Has been cancelled
CI / build (21, 22) (push) Has been cancelled
CI / build (8, ) (push) Has been cancelled
CI / snapshot (push) Has been cancelled
CI / release (push) Has been cancelled
Some checks failed
CI / build (11, ) (push) Has been cancelled
CI / build (17, ) (push) Has been cancelled
CI / build (21, ) (push) Has been cancelled
CI / build (21, 22) (push) Has been cancelled
CI / build (8, ) (push) Has been cancelled
CI / snapshot (push) Has been cancelled
CI / release (push) Has been cancelled
This commit is contained in:
@@ -9,6 +9,8 @@ FlatLaf Change Log
|
||||
using custom component that overrides `Component.contains(int x, int y)` and
|
||||
invokes `SwingUtilities.convertPoint()` (or similar) from the overridden
|
||||
method. (issue #878)
|
||||
- ToolBar: Fixed endless loop if button in Toolbar has focus and is made
|
||||
invisible. (issue #884)
|
||||
|
||||
|
||||
## 3.5.1
|
||||
|
||||
@@ -531,8 +531,11 @@ public class FlatToolBarUI
|
||||
|
||||
private Component getRecentComponent( Container aContainer, boolean first ) {
|
||||
// if moving focus into the toolbar, focus recently focused toolbar button
|
||||
if( focusedCompIndex >= 0 && focusedCompIndex < toolBar.getComponentCount() )
|
||||
return toolBar.getComponent( focusedCompIndex );
|
||||
if( focusedCompIndex >= 0 && focusedCompIndex < toolBar.getComponentCount() ) {
|
||||
Component c = toolBar.getComponent( focusedCompIndex );
|
||||
if( accept( c ) )
|
||||
return c;
|
||||
}
|
||||
|
||||
return first
|
||||
? super.getFirstComponent( aContainer )
|
||||
|
||||
Reference in New Issue
Block a user