From afccdc47493f2f80e6ebb57b76ac46a2453ded99 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 13 Nov 2020 23:25:19 +0100 Subject: [PATCH] Demo: "Tabs" tab: improved demo of leading and trailing tab area components by using toolbars --- .../com/formdev/flatlaf/demo/TabsPanel.java | 28 ++++++++++--------- .../flatlaf/demo/icons/buildLoadChanges.svg | 3 ++ .../com/formdev/flatlaf/demo/icons/commit.svg | 3 ++ .../com/formdev/flatlaf/demo/icons/diff.svg | 6 ++++ .../formdev/flatlaf/demo/icons/listFiles.svg | 7 +++++ .../formdev/flatlaf/demo/icons/project.svg | 6 ++++ 6 files changed, 40 insertions(+), 13 deletions(-) create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/buildLoadChanges.svg create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/commit.svg create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/diff.svg create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/listFiles.svg create mode 100644 flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/project.svg diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java index ae59d89b..1540a5d6 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/TabsPanel.java @@ -162,26 +162,28 @@ class TabsPanel } private void initCustomComponentsTabs( JTabbedPane tabbedPane ) { - addDefaultTabsNoContent( tabbedPane, 3 ); + addDefaultTabsNoContent( tabbedPane, 2 ); customComponentsChanged(); } private void customComponentsChanged() { - JComponent leading = null; - JComponent trailing = null; + JToolBar leading = null; + JToolBar trailing = null; if( leadingComponentButton.isSelected() ) { - leading = new JLabel( "Leading" ); - leading.setOpaque( true ); - leading.setBackground( new Color( UIManager.getColor( "Objects.Green" ).getRGB() ) ); - leading.setForeground( Color.black ); - leading.setBorder( new EmptyBorder( 4, 4, 4, 4 ) ); + leading = new JToolBar(); + leading.setFloatable( false ); + leading.setBorder( null ); + leading.add( new JButton( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/project.svg" ) ) ); } if( trailingComponentButton.isSelected() ) { - trailing = new JLabel( "Trailing" ); - trailing.setOpaque( true ); - trailing.setBackground( new Color( UIManager.getColor( "Objects.Purple" ).getRGB() ) ); - trailing.setForeground( Color.black ); - trailing.setBorder( new EmptyBorder( 4, 4, 4, 4 ) ); + trailing = new JToolBar(); + trailing.setFloatable( false ); + trailing.setBorder( null ); + trailing.add( new JButton( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/buildLoadChanges.svg" ) ) ); + trailing.add( Box.createHorizontalGlue() ); + trailing.add( new JButton( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/commit.svg" ) ) ); + trailing.add( new JButton( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/diff.svg" ) ) ); + trailing.add( new JButton( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/listFiles.svg" ) ) ); } customComponentsTabbedPane.putClientProperty( TABBED_PANE_LEADING_COMPONENT, leading ); customComponentsTabbedPane.putClientProperty( TABBED_PANE_TRAILING_COMPONENT, trailing ); diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/buildLoadChanges.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/buildLoadChanges.svg new file mode 100644 index 00000000..02f46df0 --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/buildLoadChanges.svg @@ -0,0 +1,3 @@ + + + diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/commit.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/commit.svg new file mode 100644 index 00000000..a3bc7b6d --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/commit.svg @@ -0,0 +1,3 @@ + + + diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/diff.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/diff.svg new file mode 100644 index 00000000..56821e70 --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/diff.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/listFiles.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/listFiles.svg new file mode 100644 index 00000000..24227136 --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/listFiles.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/project.svg b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/project.svg new file mode 100644 index 00000000..42dda739 --- /dev/null +++ b/flatlaf-demo/src/main/resources/com/formdev/flatlaf/demo/icons/project.svg @@ -0,0 +1,6 @@ + + + + + +