angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #534: ToolBar: hover effect for button groups

Browse Source
This commit is contained in:
Karl Tauber
2022-10-29 19:51:37 +02:00
parent 9d8ffec276 2ef6a2c3c9
commit 607b084697
19 changed files with 386 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.java
View File

@@ -339,6 +339,7 @@ class FlatThemePreviewAll
JToggleButton button7 = new JToggleButton();
JToggleButton button8 = new JToggleButton();
JToggleButton button9 = new JToggleButton();
JToggleButton button10 = new JToggleButton();
JLabel tabbedPaneLabel = new JLabel();
tabbedPane1 = new FlatThemePreviewAll.PreviewTabbedPane();
JLabel listTreeLabel = new JLabel();
@@ -803,7 +804,6 @@ class FlatThemePreviewAll
//---- button8 ----
button8.setIcon(UIManager.getIcon("Tree.leafIcon"));
button8.setSelected(true);
button8.putClientProperty("FlatLaf.styleClass", "flatlaf-preview-toolbar-togglebutton");
toolBar1.add(button8);
@@ -812,6 +812,12 @@ class FlatThemePreviewAll
button9.setSelected(true);
button9.putClientProperty("FlatLaf.styleClass", "flatlaf-preview-toolbar-togglebutton");
toolBar1.add(button9);
//---- button10 ----
button10.setIcon(UIManager.getIcon("Tree.leafIcon"));
button10.setSelected(true);
button10.putClientProperty("FlatLaf.styleClass", "flatlaf-preview-toolbar-togglebutton");
toolBar1.add(button10);
}
add(toolBar1, "cell 1 20 2 1");
@@ -949,6 +955,12 @@ class FlatThemePreviewAll
ButtonGroup buttonGroup2 = new ButtonGroup();
buttonGroup2.add(radioButtonMenuItem4);
buttonGroup2.add(radioButtonMenuItem5);
//---- buttonGroup3 ----
ButtonGroup buttonGroup3 = new ButtonGroup();
buttonGroup3.add(button7);
buttonGroup3.add(button8);
buttonGroup3.add(button9);
// JFormDesigner - End of component initialization //GEN-END:initComponents
}

15
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewAll.jfd
View File

@@ -578,18 +578,26 @@ new FormModel {
name: "button7"
"icon": &SwingIcon0 new com.jformdesigner.model.SwingIcon( 2, "Tree.leafIcon" )
"$client.FlatLaf.styleClass": "flatlaf-preview-toolbar-togglebutton"
"$buttonGroup": new FormReference( "buttonGroup3" )
} )
add( new FormComponent( "javax.swing.JToggleButton" ) {
name: "button8"
"icon": #SwingIcon0
"selected": true
"$client.FlatLaf.styleClass": "flatlaf-preview-toolbar-togglebutton"
"$buttonGroup": new FormReference( "buttonGroup3" )
} )
add( new FormComponent( "javax.swing.JToggleButton" ) {
name: "button9"
"icon": #SwingIcon0
"selected": true
"$client.FlatLaf.styleClass": "flatlaf-preview-toolbar-togglebutton"
"$buttonGroup": new FormReference( "buttonGroup3" )
} )
add( new FormComponent( "javax.swing.JToggleButton" ) {
name: "button10"
"icon": #SwingIcon0
"selected": true
"$client.FlatLaf.styleClass": "flatlaf-preview-toolbar-togglebutton"
} )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 20 2 1"
@@ -770,5 +778,10 @@ new FormModel {
}, new FormLayoutConstraints( null ) {
"location": new java.awt.Point( 0, 1145 )
} )
add( new FormNonVisual( "javax.swing.ButtonGroup" ) {
name: "buttonGroup3"
}, new FormLayoutConstraints( null ) {
"location": new java.awt.Point( 0, 1197 )
} )
}
}

2
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt
View File

@@ -1082,6 +1082,8 @@ ToolBar.font
ToolBar.foreground
ToolBar.gripColor
ToolBar.highlight
ToolBar.hoverButtonGroupArc
ToolBar.hoverButtonGroupBackground
ToolBar.isRollover
ToolBar.light
ToolBar.separatorColor