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

ToolBar: fixed endless loop in focus navigation that may occur under special circumstances (issue #505)

Browse Source
This commit is contained in:
Karl Tauber
2022-04-06 18:53:45 +02:00
parent 301aae9b8e
commit 0dba9265be
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -7,6 +7,8 @@ FlatLaf Change Log
- Native window decorations (Windows 10/11 only): Fixed wrong window title - Native window decorations (Windows 10/11 only): Fixed wrong window title
character encoding used in Windows taskbar. (issue #502) character encoding used in Windows taskbar. (issue #502)
- ToolBar: Fixed endless loop in focus navigation that may occur under special
circumstances. (issue #505)
## 2.1 ## 2.1

6
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToolBarUI.java
View File

@@ -256,11 +256,15 @@ public class FlatToolBarUI
default: return; default: return;
} }
for( int i = focusedCompIndex + add; i != focusedCompIndex; i += add ) { int i = focusedCompIndex;
for(;;) {
i += add;
if( i < 0 ) if( i < 0 )
i = count - 1; i = count - 1;
else if( i >= count ) else if( i >= count )
i = 0; i = 0;
if( i == focusedCompIndex )
break;
Component c = toolBar.getComponentAtIndex( i ); Component c = toolBar.getComponentAtIndex( i );
if( canBeFocusOwner( c ) ) { if( canBeFocusOwner( c ) ) {