From 1050cbad85eaf98fe5c97f1e7656f56035a94524 Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:09:27 -0500 Subject: [PATCH 01/10] New project structure panel --- .../ui/panels/ProjectBrowserPanel.java | 110 ++++++++++++++++++ .../storming/ui/windows/MainWindow.java | 2 + 2 files changed, 112 insertions(+) create mode 100644 src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java diff --git a/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java b/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java new file mode 100644 index 0000000..c2bc09b --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/ProjectBrowserPanel.java @@ -0,0 +1,110 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import java.awt.*; +import java.io.File; + +public class ProjectBrowserPanel extends JPanel { + + private final JTree fileTree; + private final File rootDir; + + public ProjectBrowserPanel() { + setLayout(new BorderLayout()); + + // Use current directory as root for now + rootDir = new File(System.getProperty("user.dir")); + + // --- 1. Toolbar --- + JToolBar toolbar = new JToolBar(); + toolbar.setFloatable(false); + toolbar.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + + JButton refreshBtn = new JButton("Refresh"); + refreshBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + refreshBtn.addActionListener(e -> refreshTree()); + + toolbar.add(Box.createHorizontalStrut(5)); + toolbar.add(refreshBtn); + toolbar.addSeparator(); + + JLabel pathLabel = new JLabel(rootDir.getAbsolutePath()); + pathLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.PLAIN, 11f)); + pathLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + toolbar.add(Box.createHorizontalStrut(10)); + toolbar.add(pathLabel); + + add(toolbar, BorderLayout.NORTH); + + // --- 2. File Tree --- + DefaultMutableTreeNode rootNode = createTreeNodes(rootDir); + fileTree = new JTree(new DefaultTreeModel(rootNode)); + fileTree.setCellRenderer(new FileTreeCellRenderer()); + fileTree.putClientProperty(FlatClientProperties.STYLE, "background: darken($Panel.background, 2%)"); + fileTree.setRowHeight(24); + fileTree.setShowsRootHandles(true); + + JScrollPane scrollPane = new JScrollPane(fileTree); + scrollPane.setBorder(null); + add(scrollPane, BorderLayout.CENTER); + } + + private void refreshTree() { + DefaultMutableTreeNode rootNode = createTreeNodes(rootDir); + fileTree.setModel(new DefaultTreeModel(rootNode)); + } + + private DefaultMutableTreeNode createTreeNodes(File file) { + DefaultMutableTreeNode node = new DefaultMutableTreeNode(file.getName().isEmpty() ? file.getPath() : file.getName()); + if (file.isDirectory()) { + File[] files = file.listFiles(); + if (files != null) { + // Sort files: directories first + java.util.Arrays.sort(files, (f1, f2) -> { + if (f1.isDirectory() && !f2.isDirectory()) return -1; + if (!f1.isDirectory() && f2.isDirectory()) return 1; + return f1.getName().compareToIgnoreCase(f2.getName()); + }); + for (File child : files) { + if (child.getName().startsWith(".")) continue; // Skip hidden files + node.add(createTreeNodes(child)); + } + } + } + return node; + } + + private static class FileTreeCellRenderer extends DefaultTreeCellRenderer { + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean exp, boolean leaf, int row, boolean hasFocus) { + super.getTreeCellRendererComponent(tree, value, sel, exp, leaf, row, hasFocus); + if (leaf) { + setIcon(UIManager.getIcon("FileView.fileIcon")); + } else { + setIcon(Icons.FOLDER); + } + return this; + } + } + + @Override + protected void paintChildren(Graphics g) { + super.paintChildren(g); + Graphics2D g2 = (Graphics2D) g.create(); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.12f)); + + int size = 80; + int x = getWidth() - size - 25; + int y = getHeight() - size - 25; + if (Icons.FOLDER_80 != null) { + Icons.FOLDER_80.paintIcon(this, g2, x, y); + } + g2.dispose(); + } +} diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 9b86760..a681bdb 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -7,6 +7,7 @@ import com.parafield.storming.ui.panels.HierarchyPanel; import com.parafield.storming.ui.panels.InspectorPanel; import com.parafield.storming.ui.panels.NotificationsPanel; +import com.parafield.storming.ui.panels.ProjectBrowserPanel; import com.parafield.storming.ui.panels.SceneViewPanel; import com.parafield.storming.ui.panels.TerminalPanel; import com.parafield.storming.ui.widgets.SideBar; @@ -109,6 +110,7 @@ private void initUI() { JTabbedPane bottomTabs = new JTabbedPane(); bottomTabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); + bottomTabs.addTab("Project", Icons.FOLDER, new ProjectBrowserPanel()); bottomTabs.addTab("Console", Icons.CONSOLE, consolePanel); bottomTabs.addTab("Analyzer", Icons.WARN, new com.parafield.storming.ui.panels.AnalyzerPanel()); bottomTabs.addTab("Terminal", Icons.TERMINAL, new TerminalPanel()); From 907b24544848dd366f2d21ec3fa507cd0edaa435 Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:12:31 -0500 Subject: [PATCH 02/10] Improved project structure panel #1 --- .../storming/ui/windows/MainWindow.java | 75 +++++++++++++++++-- 1 file changed, 69 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index a681bdb..4e2be82 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -26,6 +26,7 @@ public class MainWindow extends JFrame { private JSplitPane mainHorizontalSplit; private JSplitPane rightSplit; private JSplitPane centerVerticalSplit; + private JSplitPane leftVerticalSplit; private StormingMenuBar menuBar; private SideBar leftBar; @@ -37,10 +38,15 @@ public class MainWindow extends JFrame { private String currentRightTab = "INSPECTOR"; private boolean isLeftOpen = true; + private boolean isHierarchyOpen = true; + private boolean isProjectOpen = true; private boolean isRightOpen = true; + private int leftSplitLastLoc = 280; private int rightSplitLastLoc = 280; + private int leftVerticalSplitLastLoc = 450; + private JToggleButton hierarchyBtn; private JToggleButton projectBtn; private JToggleButton inspectorBtn; private JToggleButton notificationsBtn; @@ -110,18 +116,22 @@ private void initUI() { JTabbedPane bottomTabs = new JTabbedPane(); bottomTabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); - bottomTabs.addTab("Project", Icons.FOLDER, new ProjectBrowserPanel()); bottomTabs.addTab("Console", Icons.CONSOLE, consolePanel); bottomTabs.addTab("Analyzer", Icons.WARN, new com.parafield.storming.ui.panels.AnalyzerPanel()); bottomTabs.addTab("Terminal", Icons.TERMINAL, new TerminalPanel()); // --- 3. Construct Layout Hierarchy --- - // Top: [ Hierarchy | [ Scene | Inspector ] ] + // Top: [ Hierarchy/Project | [ Scene | Inspector ] ] rightSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, editorTabs, rightCardPanel, 800, 0.0); HierarchyPanel hierarchyPanel = new HierarchyPanel(); ToolWindow hierarchyTW = new ToolWindow("Hierarchy", hierarchyPanel); - mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, hierarchyTW, rightSplit, 280, 0.0); + + ProjectBrowserPanel projectPanel = new ProjectBrowserPanel(); + ToolWindow projectTW = new ToolWindow("Project", projectPanel); + + leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, hierarchyTW, projectTW, 450, 0.5); + mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, leftVerticalSplit, rightSplit, 280, 0.0); // Final Vertical Split: Top Workspace / Bottom Tabs centerVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, mainHorizontalSplit, bottomTabs, 650, 0.0); @@ -129,7 +139,9 @@ private void initUI() { // --- 4. SideBars (JetBrains Style) --- leftBar = new SideBar(SwingConstants.VERTICAL, 40); leftBar.setAlpha(0.0f); - projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleLeftPanel); + hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, this::toggleHierarchy); + projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleProject); + hierarchyBtn.setSelected(true); projectBtn.setSelected(true); leftBar.add(Box.createVerticalGlue()); @@ -156,7 +168,45 @@ private void initUI() { root.add(statusBar, BorderLayout.SOUTH); } - private void toggleLeftPanel() { + private void toggleHierarchy() { + if (isHierarchyOpen) { + if (isProjectOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, 0, 250); + } else { + toggleLeftDrawer(); + } + } else { + if (isProjectOpen) { + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + } else { + toggleLeftDrawer(); + } + } + isHierarchyOpen = !isHierarchyOpen; + updateLeftBar(); + } + + private void toggleProject() { + if (isProjectOpen) { + if (isHierarchyOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); + } else { + toggleLeftDrawer(); + } + } else { + if (isHierarchyOpen) { + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + } else { + toggleLeftDrawer(); + } + } + isProjectOpen = !isProjectOpen; + updateLeftBar(); + } + + private void toggleLeftDrawer() { if (isLeftOpen) { leftSplitLastLoc = mainHorizontalSplit.getDividerLocation(); UIAnimator.animateSplit(mainHorizontalSplit, 0, 250); @@ -164,7 +214,20 @@ private void toggleLeftPanel() { UIAnimator.animateSplit(mainHorizontalSplit, leftSplitLastLoc, 250); } isLeftOpen = !isLeftOpen; - projectBtn.setSelected(isLeftOpen); + } + + private void updateLeftBar() { + hierarchyBtn.setSelected(isHierarchyOpen && isLeftOpen); + projectBtn.setSelected(isProjectOpen && isLeftOpen); + + // If both are closed, close the whole drawer + if (!isHierarchyOpen && !isProjectOpen && isLeftOpen) { + toggleLeftDrawer(); + } + // If opening one when drawer is closed, open the drawer + else if ((isHierarchyOpen || isProjectOpen) && !isLeftOpen) { + toggleLeftDrawer(); + } } private void handleRightSidebarClick(String tabName) { From 8792abc7ea733e8c46999bb2aa1388e3d15f3f3b Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:16:28 -0500 Subject: [PATCH 03/10] Added clear indication for upper and under side panels. --- .../com/parafield/storming/ui/widgets/SideBar.java | 12 ++++++++++++ .../parafield/storming/ui/windows/MainWindow.java | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java index 9af2707..e5a7456 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java @@ -70,4 +70,16 @@ protected void paintComponent(Graphics g) { add(Box.createVerticalStrut(2)); return btn; } + + public void addSeparator() { + JPanel sep = new JPanel(); + sep.setMaximumSize(new Dimension(barWidth - 14, 1)); + sep.setPreferredSize(new Dimension(barWidth - 14, 1)); + sep.setBackground(UIManager.getColor("Component.borderColor")); + sep.setAlignmentX(Component.CENTER_ALIGNMENT); + + add(Box.createVerticalStrut(6)); + add(sep); + add(Box.createVerticalStrut(6)); + } } diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 4e2be82..4dc4d8d 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -140,6 +140,7 @@ private void initUI() { leftBar = new SideBar(SwingConstants.VERTICAL, 40); leftBar.setAlpha(0.0f); hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, this::toggleHierarchy); + leftBar.addSeparator(); projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleProject); hierarchyBtn.setSelected(true); projectBtn.setSelected(true); From 91634620261a70cccb22526603a8d156fe6a701d Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:30:07 -0500 Subject: [PATCH 04/10] New git panel --- .../storming/ui/panels/GitPanel.java | 110 ++++++++++++++++++ .../storming/ui/widgets/SideBar.java | 4 + .../storming/ui/windows/MainWindow.java | 64 ++++++---- .../com/parafield/storming/icons/PR.png | Bin 0 -> 4697 bytes .../com/parafield/storming/icons/PR.svg | 7 ++ .../parafield/storming/icons/Structure.png | Bin 0 -> 4531 bytes .../parafield/storming/icons/Structure.svg | 7 ++ .../com/parafield/storming/icons/commit.png | Bin 0 -> 11742 bytes .../com/parafield/storming/icons/commit.svg | 7 ++ 9 files changed, 175 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/parafield/storming/ui/panels/GitPanel.java create mode 100644 src/main/resources/com/parafield/storming/icons/PR.png create mode 100644 src/main/resources/com/parafield/storming/icons/PR.svg create mode 100644 src/main/resources/com/parafield/storming/icons/Structure.png create mode 100644 src/main/resources/com/parafield/storming/icons/Structure.svg create mode 100644 src/main/resources/com/parafield/storming/icons/commit.png create mode 100644 src/main/resources/com/parafield/storming/icons/commit.svg diff --git a/src/main/java/com/parafield/storming/ui/panels/GitPanel.java b/src/main/java/com/parafield/storming/ui/panels/GitPanel.java new file mode 100644 index 0000000..86b3ff3 --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/GitPanel.java @@ -0,0 +1,110 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; + +public class GitPanel extends JPanel { + + private final JPanel changesList; + private final JTextArea commitMessage; + private final JLabel branchLabel; + + public GitPanel() { + setLayout(new BorderLayout()); + + // --- 1. Header (Branch Info) --- + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + branchLabel = new JLabel(" master", Icons.GIT, SwingConstants.LEFT); + branchLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + header.add(branchLabel, BorderLayout.WEST); + + JPanel actions = new JPanel(new FlowLayout(FlowLayout.RIGHT, 5, 2)); + actions.setOpaque(false); + JButton refreshBtn = new JButton(Icons.RESTART); // Reuse icon + refreshBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + refreshBtn.setToolTipText("Refresh Status"); + actions.add(refreshBtn); + header.add(actions, BorderLayout.EAST); + + add(header, BorderLayout.NORTH); + + // --- 2. Changes List --- + changesList = new JPanel(); + changesList.setLayout(new BoxLayout(changesList, BoxLayout.Y_AXIS)); + changesList.setBackground(UIManager.getColor("TextArea.background")); + + // Mock data for now + addChangeItem("src/main/java/MainWindow.java", "modified"); + addChangeItem("Engine/2D/src/Renderer.cpp", "modified"); + addChangeItem("assets/textures/player.png", "untracked"); + + JScrollPane scrollPane = new JScrollPane(changesList); + scrollPane.setBorder(null); + + // --- 3. Commit Section --- + JPanel commitSection = new JPanel(new BorderLayout(0, 5)); + commitSection.setBorder(new EmptyBorder(10, 10, 10, 10)); + + commitMessage = new JTextArea(); + commitMessage.putClientProperty(FlatClientProperties.PLACEHOLDER_TEXT, "Commit message..."); + commitMessage.setLineWrap(true); + commitMessage.setWrapStyleWord(true); + commitMessage.setFont(new Font("SansSerif", Font.PLAIN, 12)); + commitMessage.putClientProperty(FlatClientProperties.STYLE, "arc: 8; background: darken($Panel.background, 3%)"); + + JScrollPane msgScroll = new JScrollPane(commitMessage); + msgScroll.setPreferredSize(new Dimension(0, 80)); + msgScroll.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Component.borderColor"))); + + JPanel btnPanel = new JPanel(new GridLayout(1, 2, 5, 0)); + JButton commitBtn = new JButton("Commit"); + commitBtn.putClientProperty(FlatClientProperties.STYLE, "background: #3498db; foreground: #ffffff; hoverBackground: #2980b9"); + + JButton pushBtn = new JButton("Commit and Push..."); + + btnPanel.add(commitBtn); + btnPanel.add(pushBtn); + + commitSection.add(msgScroll, BorderLayout.CENTER); + commitSection.add(btnPanel, BorderLayout.SOUTH); + + // --- Layout --- + JSplitPane split = new JSplitPane(JSplitPane.VERTICAL_SPLIT, scrollPane, commitSection); + split.setDividerLocation(300); + split.setDividerSize(3); + split.setBorder(null); + split.setResizeWeight(1.0); + + add(split, BorderLayout.CENTER); + } + + private void addChangeItem(String file, String status) { + JPanel item = new JPanel(new BorderLayout()); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 28)); + item.setPreferredSize(new Dimension(0, 28)); + item.setOpaque(false); + item.setBorder(new EmptyBorder(0, 5, 0, 5)); + + JCheckBox cb = new JCheckBox(file); + cb.setSelected(true); + cb.setFont(UIManager.getFont("defaultFont").deriveFont(12f)); + + JLabel statusLbl = new JLabel(status); + statusLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.ITALIC, 10f)); + statusLbl.setForeground(status.equals("untracked") ? new Color(155, 89, 182) : new Color(46, 204, 113)); + + item.add(cb, BorderLayout.CENTER); + item.add(statusLbl, BorderLayout.EAST); + + changesList.add(item); + } +} diff --git a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java index e5a7456..462bf2e 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java @@ -82,4 +82,8 @@ public void addSeparator() { add(sep); add(Box.createVerticalStrut(6)); } + + public void addGlue() { + add(Box.createVerticalGlue()); + } } diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 4dc4d8d..2d467c1 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -8,6 +8,7 @@ import com.parafield.storming.ui.panels.InspectorPanel; import com.parafield.storming.ui.panels.NotificationsPanel; import com.parafield.storming.ui.panels.ProjectBrowserPanel; +import com.parafield.storming.ui.panels.GitPanel; import com.parafield.storming.ui.panels.SceneViewPanel; import com.parafield.storming.ui.panels.TerminalPanel; import com.parafield.storming.ui.widgets.SideBar; @@ -37,9 +38,13 @@ public class MainWindow extends JFrame { private JPanel rightCardPanel; private String currentRightTab = "INSPECTOR"; + private CardLayout leftBottomCardLayout; + private JPanel leftBottomCardPanel; + private String currentLeftBottomTab = "PROJECT"; + private boolean isLeftOpen = true; private boolean isHierarchyOpen = true; - private boolean isProjectOpen = true; + private boolean isLeftBottomOpen = true; private boolean isRightOpen = true; private int leftSplitLastLoc = 280; @@ -48,6 +53,7 @@ public class MainWindow extends JFrame { private JToggleButton hierarchyBtn; private JToggleButton projectBtn; + private JToggleButton commitBtn; private JToggleButton inspectorBtn; private JToggleButton notificationsBtn; @@ -127,10 +133,12 @@ private void initUI() { HierarchyPanel hierarchyPanel = new HierarchyPanel(); ToolWindow hierarchyTW = new ToolWindow("Hierarchy", hierarchyPanel); - ProjectBrowserPanel projectPanel = new ProjectBrowserPanel(); - ToolWindow projectTW = new ToolWindow("Project", projectPanel); + leftBottomCardLayout = new CardLayout(); + leftBottomCardPanel = new JPanel(leftBottomCardLayout); + leftBottomCardPanel.add(new ToolWindow("Project", new ProjectBrowserPanel()), "PROJECT"); + leftBottomCardPanel.add(new ToolWindow("Commit", new GitPanel()), "GIT"); - leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, hierarchyTW, projectTW, 450, 0.5); + leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, hierarchyTW, leftBottomCardPanel, 450, 0.5); mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, leftVerticalSplit, rightSplit, 280, 0.0); // Final Vertical Split: Top Workspace / Bottom Tabs @@ -141,12 +149,14 @@ private void initUI() { leftBar.setAlpha(0.0f); hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, this::toggleHierarchy); leftBar.addSeparator(); - projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleProject); + projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, () -> handleLeftBottomClick("PROJECT")); + + leftBar.addGlue(); + commitBtn = (JToggleButton) leftBar.addTab("Commit", Icons.GIT, true, () -> handleLeftBottomClick("GIT")); + hierarchyBtn.setSelected(true); projectBtn.setSelected(true); - leftBar.add(Box.createVerticalGlue()); - rightBar = new SideBar(SwingConstants.VERTICAL, 40); rightBar.setAlpha(0.0f); inspectorBtn = (JToggleButton) rightBar.addTab("Inspector", Icons.SEARCH, true, () -> handleRightSidebarClick("INSPECTOR")); @@ -171,14 +181,14 @@ private void initUI() { private void toggleHierarchy() { if (isHierarchyOpen) { - if (isProjectOpen) { + if (isLeftBottomOpen) { leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); UIAnimator.animateSplit(leftVerticalSplit, 0, 250); } else { toggleLeftDrawer(); } } else { - if (isProjectOpen) { + if (isLeftBottomOpen) { UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); } else { toggleLeftDrawer(); @@ -188,22 +198,27 @@ private void toggleHierarchy() { updateLeftBar(); } - private void toggleProject() { - if (isProjectOpen) { - if (isHierarchyOpen) { - leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); - UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); - } else { - toggleLeftDrawer(); - } + private void handleLeftBottomClick(String tabName) { + if (!isLeftBottomOpen) { + leftBottomCardLayout.show(leftBottomCardPanel, tabName); + currentLeftBottomTab = tabName; + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + isLeftBottomOpen = true; + if (!isLeftOpen) toggleLeftDrawer(); } else { - if (isHierarchyOpen) { - UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + if (currentLeftBottomTab.equals(tabName)) { + if (isHierarchyOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); + } else { + toggleLeftDrawer(); + } + isLeftBottomOpen = false; } else { - toggleLeftDrawer(); + leftBottomCardLayout.show(leftBottomCardPanel, tabName); + currentLeftBottomTab = tabName; } } - isProjectOpen = !isProjectOpen; updateLeftBar(); } @@ -219,14 +234,15 @@ private void toggleLeftDrawer() { private void updateLeftBar() { hierarchyBtn.setSelected(isHierarchyOpen && isLeftOpen); - projectBtn.setSelected(isProjectOpen && isLeftOpen); + projectBtn.setSelected(isLeftBottomOpen && isLeftOpen && currentLeftBottomTab.equals("PROJECT")); + commitBtn.setSelected(isLeftBottomOpen && isLeftOpen && currentLeftBottomTab.equals("GIT")); // If both are closed, close the whole drawer - if (!isHierarchyOpen && !isProjectOpen && isLeftOpen) { + if (!isHierarchyOpen && !isLeftBottomOpen && isLeftOpen) { toggleLeftDrawer(); } // If opening one when drawer is closed, open the drawer - else if ((isHierarchyOpen || isProjectOpen) && !isLeftOpen) { + else if ((isHierarchyOpen || isLeftBottomOpen) && !isLeftOpen) { toggleLeftDrawer(); } } diff --git a/src/main/resources/com/parafield/storming/icons/PR.png b/src/main/resources/com/parafield/storming/icons/PR.png new file mode 100644 index 0000000000000000000000000000000000000000..c72cedb14086f5058401ea45f9b628ba4f94caaf GIT binary patch literal 4697 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 Mj-hsireoy)05iSceE + + + + + + \ No newline at end of file diff --git a/src/main/resources/com/parafield/storming/icons/Structure.png b/src/main/resources/com/parafield/storming/icons/Structure.png new file mode 100644 index 0000000000000000000000000000000000000000..111ea16f0f46f980b2f992a5df0af5d45d91fafe GIT binary patch literal 4531 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 Gq5lBmHDS8| literal 0 HcmV?d00001 diff --git a/src/main/resources/com/parafield/storming/icons/Structure.svg b/src/main/resources/com/parafield/storming/icons/Structure.svg new file mode 100644 index 0000000..20a6475 --- /dev/null +++ b/src/main/resources/com/parafield/storming/icons/Structure.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/com/parafield/storming/icons/commit.png b/src/main/resources/com/parafield/storming/icons/commit.png new file mode 100644 index 0000000000000000000000000000000000000000..56cfb02360be8f0068b02e46e6d11a6fe0637ad0 GIT binary patch literal 11742 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 + + + + + + \ No newline at end of file From 9b4a53e1ff81da7e94e0d47c0f0300758f01d63a Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:36:29 -0500 Subject: [PATCH 05/10] moved git panel, new PR panel --- .../java/com/parafield/storming/Icons.java | 2 + .../parafield/storming/ui/panels/PRPanel.java | 81 +++++++++++++ .../storming/ui/windows/MainWindow.java | 111 +++++++++--------- 3 files changed, 141 insertions(+), 53 deletions(-) create mode 100644 src/main/java/com/parafield/storming/ui/panels/PRPanel.java diff --git a/src/main/java/com/parafield/storming/Icons.java b/src/main/java/com/parafield/storming/Icons.java index d656259..fd8bd23 100644 --- a/src/main/java/com/parafield/storming/Icons.java +++ b/src/main/java/com/parafield/storming/Icons.java @@ -63,6 +63,8 @@ private static ImageIcon loadIcon(String name, int width, int height) { public static final ImageIcon EXE_ICON = loadIcon("exe-icon", 18, 18); public static final ImageIcon GIT = loadIcon("Git", 18, 18); + public static final ImageIcon COMMIT = loadIcon("commit", 18, 18); + public static final ImageIcon PR = loadIcon("PR", 18, 18); public static final ImageIcon GRID = loadIcon("grid", 16, 16); public static final ImageIcon MAGNET = loadIcon("magnet", 16, 16); public static final ImageIcon PLUS = loadIcon("plus", 16, 16); diff --git a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java new file mode 100644 index 0000000..548955a --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java @@ -0,0 +1,81 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + +public class PRPanel extends JPanel { + + private final JPanel prList; + + public PRPanel() { + setLayout(new BorderLayout()); + + // --- 1. Header --- + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + JLabel title = new JLabel(" Pull Requests", Icons.PR, SwingConstants.LEFT); + title.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + header.add(title, BorderLayout.WEST); + + JButton createBtn = new JButton(Icons.PLUS); + createBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + createBtn.setToolTipText("New Pull Request"); + header.add(createBtn, BorderLayout.EAST); + + add(header, BorderLayout.NORTH); + + // --- 2. PR List --- + prList = new JPanel(); + prList.setLayout(new BoxLayout(prList, BoxLayout.Y_AXIS)); + prList.setBackground(UIManager.getColor("TextArea.background")); + + addPRItem("#42: Refactor Renderer API", "batista", "2 hours ago"); + addPRItem("#41: Add Vulkan backend support", "parafield", "Yesterday"); + addPRItem("#40: Fix crash on window resize", "contributor1", "3 days ago"); + + JScrollPane scrollPane = new JScrollPane(prList); + scrollPane.setBorder(null); + add(scrollPane, BorderLayout.CENTER); + + // --- 3. Footer --- + JButton createPRBigBtn = new JButton("Create Pull Request..."); + createPRBigBtn.putClientProperty(FlatClientProperties.STYLE, "background: #27ae60; foreground: #ffffff;"); + JPanel footer = new JPanel(new BorderLayout()); + footer.setBorder(new EmptyBorder(10, 10, 10, 10)); + footer.add(createPRBigBtn, BorderLayout.CENTER); + add(footer, BorderLayout.SOUTH); + } + + private void addPRItem(String title, String author, String time) { + JPanel item = new JPanel(new GridBagLayout()); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 50)); + item.setPreferredSize(new Dimension(0, 50)); + item.setOpaque(false); + item.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + + GridBagConstraints gbc = new GridBagConstraints(); + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.weightx = 1.0; + gbc.insets = new Insets(5, 10, 0, 10); + + JLabel titleLabel = new JLabel(title); + titleLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 12f)); + gbc.gridy = 0; + item.add(titleLabel, gbc); + + JLabel infoLabel = new JLabel(author + " • " + time); + infoLabel.setFont(UIManager.getFont("defaultFont").deriveFont(10f)); + infoLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + gbc.gridy = 1; + gbc.insets = new Insets(0, 10, 5, 10); + item.add(infoLabel, gbc); + + prList.add(item); + } +} diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 2d467c1..0781bc4 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -9,8 +9,10 @@ import com.parafield.storming.ui.panels.NotificationsPanel; import com.parafield.storming.ui.panels.ProjectBrowserPanel; import com.parafield.storming.ui.panels.GitPanel; +import com.parafield.storming.ui.panels.PRPanel; import com.parafield.storming.ui.panels.SceneViewPanel; import com.parafield.storming.ui.panels.TerminalPanel; +import com.parafield.storming.ui.panels.HierarchyPanel; import com.parafield.storming.ui.widgets.SideBar; import com.parafield.storming.ui.widgets.ToolWindow; import com.parafield.storming.ui.widgets.StormingMenuBar; @@ -38,13 +40,13 @@ public class MainWindow extends JFrame { private JPanel rightCardPanel; private String currentRightTab = "INSPECTOR"; - private CardLayout leftBottomCardLayout; - private JPanel leftBottomCardPanel; - private String currentLeftBottomTab = "PROJECT"; + private CardLayout leftUpperCardLayout; + private JPanel leftUpperCardPanel; + private String currentLeftUpperTab = "HIERARCHY"; private boolean isLeftOpen = true; - private boolean isHierarchyOpen = true; - private boolean isLeftBottomOpen = true; + private boolean isLeftUpperOpen = true; + private boolean isProjectOpen = true; private boolean isRightOpen = true; private int leftSplitLastLoc = 280; @@ -52,8 +54,9 @@ public class MainWindow extends JFrame { private int leftVerticalSplitLastLoc = 450; private JToggleButton hierarchyBtn; - private JToggleButton projectBtn; private JToggleButton commitBtn; + private JToggleButton prBtn; + private JToggleButton projectBtn; private JToggleButton inspectorBtn; private JToggleButton notificationsBtn; @@ -127,18 +130,19 @@ private void initUI() { bottomTabs.addTab("Terminal", Icons.TERMINAL, new TerminalPanel()); // --- 3. Construct Layout Hierarchy --- - // Top: [ Hierarchy/Project | [ Scene | Inspector ] ] + // Top: [ Hierarchy/Commit/PR | [ Scene | Inspector ] ] rightSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, editorTabs, rightCardPanel, 800, 0.0); - HierarchyPanel hierarchyPanel = new HierarchyPanel(); - ToolWindow hierarchyTW = new ToolWindow("Hierarchy", hierarchyPanel); + leftUpperCardLayout = new CardLayout(); + leftUpperCardPanel = new JPanel(leftUpperCardLayout); + leftUpperCardPanel.add(new ToolWindow("Hierarchy", new HierarchyPanel()), "HIERARCHY"); + leftUpperCardPanel.add(new ToolWindow("Commit", new GitPanel()), "COMMIT"); + leftUpperCardPanel.add(new ToolWindow("Pull Requests", new PRPanel()), "PR"); - leftBottomCardLayout = new CardLayout(); - leftBottomCardPanel = new JPanel(leftBottomCardLayout); - leftBottomCardPanel.add(new ToolWindow("Project", new ProjectBrowserPanel()), "PROJECT"); - leftBottomCardPanel.add(new ToolWindow("Commit", new GitPanel()), "GIT"); + ProjectBrowserPanel projectPanel = new ProjectBrowserPanel(); + ToolWindow projectTW = new ToolWindow("Project", projectPanel); - leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, hierarchyTW, leftBottomCardPanel, 450, 0.5); + leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, leftUpperCardPanel, projectTW, 450, 0.5); mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, leftVerticalSplit, rightSplit, 280, 0.0); // Final Vertical Split: Top Workspace / Bottom Tabs @@ -147,12 +151,12 @@ private void initUI() { // --- 4. SideBars (JetBrains Style) --- leftBar = new SideBar(SwingConstants.VERTICAL, 40); leftBar.setAlpha(0.0f); - hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, this::toggleHierarchy); - leftBar.addSeparator(); - projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, () -> handleLeftBottomClick("PROJECT")); + hierarchyBtn = (JToggleButton) leftBar.addTab("Hierarchy", Icons.GRID, true, () -> handleLeftUpperClick("HIERARCHY")); + commitBtn = (JToggleButton) leftBar.addTab("Commit", Icons.COMMIT, true, () -> handleLeftUpperClick("COMMIT")); + prBtn = (JToggleButton) leftBar.addTab("Pull Requests", Icons.PR, true, () -> handleLeftUpperClick("PR")); - leftBar.addGlue(); - commitBtn = (JToggleButton) leftBar.addTab("Commit", Icons.GIT, true, () -> handleLeftBottomClick("GIT")); + leftBar.addSeparator(); + projectBtn = (JToggleButton) leftBar.addTab("Project", Icons.FOLDER, true, this::toggleProject); hierarchyBtn.setSelected(true); projectBtn.setSelected(true); @@ -179,46 +183,46 @@ private void initUI() { root.add(statusBar, BorderLayout.SOUTH); } - private void toggleHierarchy() { - if (isHierarchyOpen) { - if (isLeftBottomOpen) { - leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); - UIAnimator.animateSplit(leftVerticalSplit, 0, 250); - } else { - toggleLeftDrawer(); - } + private void handleLeftUpperClick(String tabName) { + if (!isLeftUpperOpen) { + leftUpperCardLayout.show(leftUpperCardPanel, tabName); + currentLeftUpperTab = tabName; + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + isLeftUpperOpen = true; + if (!isLeftOpen) toggleLeftDrawer(); } else { - if (isLeftBottomOpen) { - UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); + if (currentLeftUpperTab.equals(tabName)) { + if (isProjectOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, 0, 250); + } else { + toggleLeftDrawer(); + } + isLeftUpperOpen = false; } else { - toggleLeftDrawer(); + leftUpperCardLayout.show(leftUpperCardPanel, tabName); + currentLeftUpperTab = tabName; } } - isHierarchyOpen = !isHierarchyOpen; updateLeftBar(); } - private void handleLeftBottomClick(String tabName) { - if (!isLeftBottomOpen) { - leftBottomCardLayout.show(leftBottomCardPanel, tabName); - currentLeftBottomTab = tabName; - UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); - isLeftBottomOpen = true; - if (!isLeftOpen) toggleLeftDrawer(); + private void toggleProject() { + if (isProjectOpen) { + if (isLeftUpperOpen) { + leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); + } else { + toggleLeftDrawer(); + } } else { - if (currentLeftBottomTab.equals(tabName)) { - if (isHierarchyOpen) { - leftVerticalSplitLastLoc = leftVerticalSplit.getDividerLocation(); - UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplit.getHeight(), 250); - } else { - toggleLeftDrawer(); - } - isLeftBottomOpen = false; + if (isLeftUpperOpen) { + UIAnimator.animateSplit(leftVerticalSplit, leftVerticalSplitLastLoc, 250); } else { - leftBottomCardLayout.show(leftBottomCardPanel, tabName); - currentLeftBottomTab = tabName; + toggleLeftDrawer(); } } + isProjectOpen = !isProjectOpen; updateLeftBar(); } @@ -233,16 +237,17 @@ private void toggleLeftDrawer() { } private void updateLeftBar() { - hierarchyBtn.setSelected(isHierarchyOpen && isLeftOpen); - projectBtn.setSelected(isLeftBottomOpen && isLeftOpen && currentLeftBottomTab.equals("PROJECT")); - commitBtn.setSelected(isLeftBottomOpen && isLeftOpen && currentLeftBottomTab.equals("GIT")); + hierarchyBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("HIERARCHY")); + commitBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("COMMIT")); + prBtn.setSelected(isLeftUpperOpen && isLeftOpen && currentLeftUpperTab.equals("PR")); + projectBtn.setSelected(isProjectOpen && isLeftOpen); // If both are closed, close the whole drawer - if (!isHierarchyOpen && !isLeftBottomOpen && isLeftOpen) { + if (!isLeftUpperOpen && !isProjectOpen && isLeftOpen) { toggleLeftDrawer(); } // If opening one when drawer is closed, open the drawer - else if ((isHierarchyOpen || isLeftBottomOpen) && !isLeftOpen) { + else if ((isLeftUpperOpen || isProjectOpen) && !isLeftOpen) { toggleLeftDrawer(); } } From 3fc2a40b099a90cbc70fcca44e95cf7890079100 Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:44:49 -0500 Subject: [PATCH 06/10] PR Panel updates --- .../ui/panels/PRDetailsCenterPanel.java | 62 +++++++++++++ .../ui/panels/PRDetailsSidePanel.java | 86 +++++++++++++++++++ .../parafield/storming/ui/panels/PRPanel.java | 41 +++++++-- .../storming/ui/windows/MainWindow.java | 17 +++- 4 files changed, 199 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java create mode 100644 src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java diff --git a/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java new file mode 100644 index 0000000..a7f4bce --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRDetailsCenterPanel.java @@ -0,0 +1,62 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + +public class PRDetailsCenterPanel extends JPanel { + + public PRDetailsCenterPanel(String title, String author) { + setLayout(new BorderLayout()); + setBackground(UIManager.getColor("Panel.background")); + + // --- Header Section --- + JPanel header = new JPanel(); + header.setLayout(new BoxLayout(header, BoxLayout.Y_AXIS)); + header.setBorder(new EmptyBorder(20, 25, 15, 25)); + header.setOpaque(false); + + JLabel titleLabel = new JLabel(title); + titleLabel.setFont(new Font("SansSerif", Font.BOLD, 22)); + + JLabel authorLabel = new JLabel("Opened by " + author + " • 3 comments"); + authorLabel.setForeground(UIManager.getColor("Label.disabledForeground")); + authorLabel.setFont(new Font("SansSerif", Font.PLAIN, 13)); + + header.add(titleLabel); + header.add(Box.createVerticalStrut(5)); + header.add(authorLabel); + + // --- Tabs (Description / Logs) --- + JTabbedPane tabs = new JTabbedPane(); + tabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); + + // Description Tab + JTextArea desc = new JTextArea("This pull request introduces the new centralized PR management system.\n\n" + + "Summary of changes:\n" + + "- Added PRPanel with list and detail views.\n" + + "- Integrated with MainWindow editor tabs.\n" + + "- Improved SideBar interaction."); + desc.setEditable(false); + desc.setOpaque(false); + desc.setLineWrap(true); + desc.setWrapStyleWord(true); + desc.setBorder(new EmptyBorder(10, 10, 10, 10)); + tabs.addTab("Description", new JScrollPane(desc)); + + // Logs Tab + JTextArea logs = new JTextArea("[SUCCESS] Build passed in 1m 24s\n" + + "[SUCCESS] All unit tests passed (124/124)\n" + + "[INFO] Deployed to staging-01"); + logs.setEditable(false); + logs.setFont(new Font("JetBrains Mono", Font.PLAIN, 12)); + logs.setBackground(new Color(20, 20, 25)); + logs.setForeground(new Color(46, 204, 113)); + logs.setBorder(new EmptyBorder(10, 10, 10, 10)); + tabs.addTab("Checks & Logs", new JScrollPane(logs)); + + add(header, BorderLayout.NORTH); + add(tabs, BorderLayout.CENTER); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java new file mode 100644 index 0000000..ac75c77 --- /dev/null +++ b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java @@ -0,0 +1,86 @@ +package com.parafield.storming.ui.panels; + +import com.formdev.flatlaf.FlatClientProperties; +import com.parafield.storming.Icons; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + +public class PRDetailsSidePanel extends JPanel { + + private final Runnable onBack; + private final JPanel content; + + public PRDetailsSidePanel(String title, Runnable onBack) { + this.onBack = onBack; + setLayout(new BorderLayout()); + + // --- 1. Header (Back Button) --- + JPanel header = new JPanel(new BorderLayout()); + header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + header.setPreferredSize(new Dimension(0, 32)); + header.setBackground(UIManager.getColor("Panel.background")); + + JButton backBtn = new JButton("← Back"); + backBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); + backBtn.addActionListener(e -> onBack.run()); + header.add(backBtn, BorderLayout.WEST); + + add(header, BorderLayout.NORTH); + + // --- 2. Changed Files & Checks --- + content = new JPanel(); + content.setLayout(new BoxLayout(content, BoxLayout.Y_AXIS)); + content.setBorder(new EmptyBorder(10, 10, 10, 10)); + + JLabel titleLbl = new JLabel("Files Changed"); + titleLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + titleLbl.setForeground(UIManager.getColor("Label.disabledForeground")); + content.add(titleLbl); + content.add(Box.createVerticalStrut(10)); + + addFileItem("src/main/ui/PRPanel.java", "+42 -12"); + addFileItem("src/main/ui/MainWindow.java", "+15 -5"); + addFileItem("Engine/Core/Log.cpp", "+2 -2"); + + content.add(Box.createVerticalStrut(20)); + + JLabel checkLbl = new JLabel("Checks (3 Passed)"); + checkLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); + checkLbl.setForeground(new Color(46, 204, 113)); + content.add(checkLbl); + + addCheckItem("Build", true); + addCheckItem("Unit Tests", true); + addCheckItem("Linter", true); + + JScrollPane scrollPane = new JScrollPane(content); + scrollPane.setBorder(null); + add(scrollPane, BorderLayout.CENTER); + } + + private void addFileItem(String name, String diff) { + JPanel item = new JPanel(new BorderLayout()); + item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 26)); + item.setOpaque(false); + + JLabel nameLbl = new JLabel(name); + nameLbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); + + JLabel diffLbl = new JLabel(diff); + diffLbl.setFont(new Font("Monospaced", Font.BOLD, 11)); + diffLbl.setForeground(new Color(46, 204, 113)); + + item.add(nameLbl, BorderLayout.CENTER); + item.add(diffLbl, BorderLayout.EAST); + + content.add(item); + } + + private void addCheckItem(String name, boolean success) { + JLabel lbl = new JLabel(" ✓ " + name); + lbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); + lbl.setForeground(UIManager.getColor("Label.foreground")); + content.add(lbl); + } +} diff --git a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java index 548955a..f8c80ee 100644 --- a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java +++ b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java @@ -2,18 +2,28 @@ import com.formdev.flatlaf.FlatClientProperties; import com.parafield.storming.Icons; +import com.parafield.storming.ui.windows.MainWindow; import javax.swing.*; import javax.swing.border.EmptyBorder; import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; public class PRPanel extends JPanel { private final JPanel prList; + private final CardLayout cardLayout; + private final JPanel mainContainer; public PRPanel() { setLayout(new BorderLayout()); - // --- 1. Header --- + cardLayout = new CardLayout(); + mainContainer = new JPanel(cardLayout); + + // --- 1. PR List View --- + JPanel listView = new JPanel(new BorderLayout()); + JPanel header = new JPanel(new BorderLayout()); header.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); header.setPreferredSize(new Dimension(0, 32)); @@ -28,9 +38,8 @@ public PRPanel() { createBtn.setToolTipText("New Pull Request"); header.add(createBtn, BorderLayout.EAST); - add(header, BorderLayout.NORTH); + listView.add(header, BorderLayout.NORTH); - // --- 2. PR List --- prList = new JPanel(); prList.setLayout(new BoxLayout(prList, BoxLayout.Y_AXIS)); prList.setBackground(UIManager.getColor("TextArea.background")); @@ -41,15 +50,17 @@ public PRPanel() { JScrollPane scrollPane = new JScrollPane(prList); scrollPane.setBorder(null); - add(scrollPane, BorderLayout.CENTER); + listView.add(scrollPane, BorderLayout.CENTER); - // --- 3. Footer --- JButton createPRBigBtn = new JButton("Create Pull Request..."); createPRBigBtn.putClientProperty(FlatClientProperties.STYLE, "background: #27ae60; foreground: #ffffff;"); JPanel footer = new JPanel(new BorderLayout()); footer.setBorder(new EmptyBorder(10, 10, 10, 10)); footer.add(createPRBigBtn, BorderLayout.CENTER); - add(footer, BorderLayout.SOUTH); + listView.add(footer, BorderLayout.SOUTH); + + mainContainer.add(listView, "LIST"); + add(mainContainer, BorderLayout.CENTER); } private void addPRItem(String title, String author, String time) { @@ -58,6 +69,16 @@ private void addPRItem(String title, String author, String time) { item.setPreferredSize(new Dimension(0, 50)); item.setOpaque(false); item.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + item.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); + + item.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + showDetails(title, author); + } + } + }); GridBagConstraints gbc = new GridBagConstraints(); gbc.fill = GridBagConstraints.HORIZONTAL; @@ -78,4 +99,12 @@ private void addPRItem(String title, String author, String time) { prList.add(item); } + + public void showDetails(String title, String author) { + PRDetailsSidePanel detailView = new PRDetailsSidePanel(title, () -> cardLayout.show(mainContainer, "LIST")); + mainContainer.add(detailView, "DETAIL"); + cardLayout.show(mainContainer, "DETAIL"); + + MainWindow.getInstance().openPRDetails(title, author); + } } diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index 0781bc4..fb67037 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -10,6 +10,7 @@ import com.parafield.storming.ui.panels.ProjectBrowserPanel; import com.parafield.storming.ui.panels.GitPanel; import com.parafield.storming.ui.panels.PRPanel; +import com.parafield.storming.ui.panels.PRDetailsCenterPanel; import com.parafield.storming.ui.panels.SceneViewPanel; import com.parafield.storming.ui.panels.TerminalPanel; import com.parafield.storming.ui.panels.HierarchyPanel; @@ -59,8 +60,16 @@ public class MainWindow extends JFrame { private JToggleButton projectBtn; private JToggleButton inspectorBtn; private JToggleButton notificationsBtn; + + private JTabbedPane editorTabs; + private static MainWindow instance; + + public static MainWindow getInstance() { + return instance; + } public MainWindow() { + instance = this; setTitle("Storming Engine"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setSize(1400, 900); @@ -118,7 +127,7 @@ private void initUI() { rightCardPanel.add(new ToolWindow("Notifications", new NotificationsPanel()), "NOTIFICATIONS"); // --- 2. Center & Bottom Panels --- - JTabbedPane editorTabs = new JTabbedPane(); + editorTabs = new JTabbedPane(); editorTabs.putClientProperty(FlatClientProperties.TABBED_PANE_TAB_TYPE, FlatClientProperties.TABBED_PANE_TAB_TYPE_UNDERLINED); sceneViewPanel = new SceneViewPanel(); editorTabs.addTab("Scene", sceneViewPanel); @@ -183,6 +192,12 @@ private void initUI() { root.add(statusBar, BorderLayout.SOUTH); } + public void openPRDetails(String title, String author) { + PRDetailsCenterPanel centerPanel = new PRDetailsCenterPanel(title, author); + editorTabs.addTab("PR: " + title.split(":")[0], Icons.PR, centerPanel); + editorTabs.setSelectedComponent(centerPanel); + } + private void handleLeftUpperClick(String tabName) { if (!isLeftUpperOpen) { leftUpperCardLayout.show(leftUpperCardPanel, tabName); From 8f50937e1066211a64e61e1e51be5e99cc9b1bfb Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:48:39 -0500 Subject: [PATCH 07/10] PR Panel Text realignments --- .../ui/panels/PRDetailsSidePanel.java | 4 +++ .../parafield/storming/ui/panels/PRPanel.java | 26 +++++++++---------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java index ac75c77..e00b7a6 100644 --- a/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java +++ b/src/main/java/com/parafield/storming/ui/panels/PRDetailsSidePanel.java @@ -36,6 +36,7 @@ public PRDetailsSidePanel(String title, Runnable onBack) { JLabel titleLbl = new JLabel("Files Changed"); titleLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); titleLbl.setForeground(UIManager.getColor("Label.disabledForeground")); + titleLbl.setAlignmentX(Component.LEFT_ALIGNMENT); content.add(titleLbl); content.add(Box.createVerticalStrut(10)); @@ -48,6 +49,7 @@ public PRDetailsSidePanel(String title, Runnable onBack) { JLabel checkLbl = new JLabel("Checks (3 Passed)"); checkLbl.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 11f)); checkLbl.setForeground(new Color(46, 204, 113)); + checkLbl.setAlignmentX(Component.LEFT_ALIGNMENT); content.add(checkLbl); addCheckItem("Build", true); @@ -63,6 +65,7 @@ private void addFileItem(String name, String diff) { JPanel item = new JPanel(new BorderLayout()); item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 26)); item.setOpaque(false); + item.setAlignmentX(Component.LEFT_ALIGNMENT); JLabel nameLbl = new JLabel(name); nameLbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); @@ -81,6 +84,7 @@ private void addCheckItem(String name, boolean success) { JLabel lbl = new JLabel(" ✓ " + name); lbl.setFont(new Font("SansSerif", Font.PLAIN, 12)); lbl.setForeground(UIManager.getColor("Label.foreground")); + lbl.setAlignmentX(Component.LEFT_ALIGNMENT); content.add(lbl); } } diff --git a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java index f8c80ee..acb82d9 100644 --- a/src/main/java/com/parafield/storming/ui/panels/PRPanel.java +++ b/src/main/java/com/parafield/storming/ui/panels/PRPanel.java @@ -64,11 +64,15 @@ public PRPanel() { } private void addPRItem(String title, String author, String time) { - JPanel item = new JPanel(new GridBagLayout()); + JPanel item = new JPanel(); + item.setLayout(new BoxLayout(item, BoxLayout.Y_AXIS)); item.setMaximumSize(new Dimension(Integer.MAX_VALUE, 50)); item.setPreferredSize(new Dimension(0, 50)); item.setOpaque(false); - item.setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor"))); + item.setBorder(BorderFactory.createCompoundBorder( + BorderFactory.createMatteBorder(0, 0, 1, 0, UIManager.getColor("Component.borderColor")), + BorderFactory.createEmptyBorder(8, 12, 8, 12) + )); item.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); item.addMouseListener(new MouseAdapter() { @@ -80,22 +84,18 @@ public void mouseClicked(MouseEvent e) { } }); - GridBagConstraints gbc = new GridBagConstraints(); - gbc.fill = GridBagConstraints.HORIZONTAL; - gbc.weightx = 1.0; - gbc.insets = new Insets(5, 10, 0, 10); - JLabel titleLabel = new JLabel(title); titleLabel.setFont(UIManager.getFont("defaultFont").deriveFont(Font.BOLD, 12f)); - gbc.gridy = 0; - item.add(titleLabel, gbc); - + titleLabel.setAlignmentX(Component.LEFT_ALIGNMENT); + JLabel infoLabel = new JLabel(author + " • " + time); infoLabel.setFont(UIManager.getFont("defaultFont").deriveFont(10f)); infoLabel.setForeground(UIManager.getColor("Label.disabledForeground")); - gbc.gridy = 1; - gbc.insets = new Insets(0, 10, 5, 10); - item.add(infoLabel, gbc); + infoLabel.setAlignmentX(Component.LEFT_ALIGNMENT); + + item.add(titleLabel); + item.add(Box.createVerticalStrut(2)); + item.add(infoLabel); prList.add(item); } From 7a8780b3251970620ac15c48546f7e513640139f Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 15:57:28 -0500 Subject: [PATCH 08/10] fixed highlighting --- .../storming/ui/widgets/SideBar.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java index 462bf2e..f201915 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/SideBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/SideBar.java @@ -5,7 +5,6 @@ import java.awt.*; public class SideBar extends JPanel { - private final ButtonGroup group = new ButtonGroup(); private final int barWidth; private float alpha = 1.0f; @@ -41,23 +40,31 @@ public AbstractButton addTab(String name, Icon icon, boolean isToggle, Runnable btn = new JToggleButton(icon) { @Override protected void paintComponent(Graphics g) { - super.paintComponent(g); if (isSelected()) { - g.setColor(new Color(52, 152, 219)); // Blue indicator + Graphics2D g2 = (Graphics2D) g.create(); + g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2.setColor(new Color(52, 152, 219, 30)); // Subtle blue background + g2.fillRect(0, 0, getWidth(), getHeight()); + + g2.setColor(new Color(52, 152, 219)); // Bright blue indicator if (barWidth < 50) { // Vertical sidebar - g.fillRect(0, 8, 2, getHeight() - 16); + g2.fillRect(0, 8, 2, getHeight() - 16); } else { // Horizontal (if used) - g.fillRect(8, getHeight() - 2, getWidth() - 16, 2); + g2.fillRect(8, getHeight() - 2, getWidth() - 16, 2); } + g2.dispose(); } + super.paintComponent(g); } }; - group.add(btn); } else { btn = new JButton(icon); } btn.setToolTipText(name); + btn.setFocusPainted(false); + btn.setBorderPainted(false); + btn.setContentAreaFilled(false); btn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); btn.setPreferredSize(new Dimension(barWidth, barWidth)); btn.setMaximumSize(new Dimension(barWidth, barWidth)); From f7bc529ae2e246fb6cddf1f74c2f03ab9387f66a Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 16:01:08 -0500 Subject: [PATCH 09/10] added minize function --- .../parafield/storming/ui/widgets/ToolWindow.java | 7 ++++++- .../parafield/storming/ui/windows/MainWindow.java | 12 ++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java b/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java index 92f1e20..602bcee 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java +++ b/src/main/java/com/parafield/storming/ui/widgets/ToolWindow.java @@ -10,10 +10,12 @@ public class ToolWindow extends JPanel { private final String title; private final JComponent content; private final JPanel header; + private final Runnable onHide; - public ToolWindow(String title, JComponent content) { + public ToolWindow(String title, JComponent content, Runnable onHide) { this.title = title; this.content = content; + this.onHide = onHide; setLayout(new BorderLayout()); setBorder(BorderFactory.createMatteBorder(0, 1, 0, 1, UIManager.getColor("Component.borderColor"))); @@ -43,6 +45,9 @@ public ToolWindow(String title, JComponent content) { hideBtn.setToolTipText("Hide"); hideBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); hideBtn.setPreferredSize(new Dimension(24, 24)); + if (onHide != null) { + hideBtn.addActionListener(e -> onHide.run()); + } actions.add(optionsBtn); actions.add(hideBtn); diff --git a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java index fb67037..f14a54d 100644 --- a/src/main/java/com/parafield/storming/ui/windows/MainWindow.java +++ b/src/main/java/com/parafield/storming/ui/windows/MainWindow.java @@ -123,8 +123,8 @@ private void initUI() { // --- 1. Right Side Panels --- rightCardLayout = new CardLayout(); rightCardPanel = new JPanel(rightCardLayout); - rightCardPanel.add(new ToolWindow("Inspector", new InspectorPanel()), "INSPECTOR"); - rightCardPanel.add(new ToolWindow("Notifications", new NotificationsPanel()), "NOTIFICATIONS"); + rightCardPanel.add(new ToolWindow("Inspector", new InspectorPanel(), () -> handleRightSidebarClick("INSPECTOR")), "INSPECTOR"); + rightCardPanel.add(new ToolWindow("Notifications", new NotificationsPanel(), () -> handleRightSidebarClick("NOTIFICATIONS")), "NOTIFICATIONS"); // --- 2. Center & Bottom Panels --- editorTabs = new JTabbedPane(); @@ -144,12 +144,12 @@ private void initUI() { leftUpperCardLayout = new CardLayout(); leftUpperCardPanel = new JPanel(leftUpperCardLayout); - leftUpperCardPanel.add(new ToolWindow("Hierarchy", new HierarchyPanel()), "HIERARCHY"); - leftUpperCardPanel.add(new ToolWindow("Commit", new GitPanel()), "COMMIT"); - leftUpperCardPanel.add(new ToolWindow("Pull Requests", new PRPanel()), "PR"); + leftUpperCardPanel.add(new ToolWindow("Hierarchy", new HierarchyPanel(), () -> handleLeftUpperClick("HIERARCHY")), "HIERARCHY"); + leftUpperCardPanel.add(new ToolWindow("Commit", new GitPanel(), () -> handleLeftUpperClick("COMMIT")), "COMMIT"); + leftUpperCardPanel.add(new ToolWindow("Pull Requests", new PRPanel(), () -> handleLeftUpperClick("PR")), "PR"); ProjectBrowserPanel projectPanel = new ProjectBrowserPanel(); - ToolWindow projectTW = new ToolWindow("Project", projectPanel); + ToolWindow projectTW = new ToolWindow("Project", projectPanel, this::toggleProject); leftVerticalSplit = createSplit(JSplitPane.VERTICAL_SPLIT, leftUpperCardPanel, projectTW, 450, 0.5); mainHorizontalSplit = createSplit(JSplitPane.HORIZONTAL_SPLIT, leftVerticalSplit, rightSplit, 280, 0.0); From 0683c00b081f26387d1b826294e66894c3e85778 Mon Sep 17 00:00:00 2001 From: BatistaCakewalk <118333712+BatistaCakewalk@users.noreply.github.com> Date: Sat, 28 Feb 2026 16:05:07 -0500 Subject: [PATCH 10/10] Hamburger Improvements. --- .../storming/ui/widgets/StormingMenuBar.java | 140 +++++++++++++----- 1 file changed, 103 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java b/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java index 521f21b..a1b907a 100644 --- a/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java +++ b/src/main/java/com/parafield/storming/ui/widgets/StormingMenuBar.java @@ -5,11 +5,22 @@ import com.parafield.storming.ui.utils.UIUtils; import javax.swing.*; import java.awt.*; +import java.awt.event.AWTEventListener; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; public class StormingMenuBar extends JMenuBar { private float alpha = 1.0f; private final Runnable onPlay; private final Runnable onStop; + + private boolean expanded = false; + private final List menus = new ArrayList<>(); + private JButton projectBtn; + private JButton branchBtn; + private Component projectStrut; + private Component branchStrut; public StormingMenuBar(Runnable onPlay, Runnable onStop) { this.onPlay = onPlay; @@ -21,6 +32,43 @@ public StormingMenuBar(Runnable onPlay, Runnable onStop) { putClientProperty(FlatClientProperties.STYLE, "hoverBackground: #ffffff10;"); initMenuBar(); + setupClickOutDetection(); + } + + private void setupClickOutDetection() { + Toolkit.getDefaultToolkit().addAWTEventListener(new AWTEventListener() { + @Override + public void eventDispatched(AWTEvent event) { + if (event instanceof MouseEvent me && me.getID() == MouseEvent.MOUSE_PRESSED) { + if (expanded && !SwingUtilities.isDescendingFrom(me.getComponent(), StormingMenuBar.this)) { + // Check if a menu is currently showing its popup + boolean anyMenuShowing = false; + for (JMenu m : menus) { + if (m.isPopupMenuVisible()) { + anyMenuShowing = true; + break; + } + } + if (!anyMenuShowing) { + SwingUtilities.invokeLater(() -> setMenuExpanded(false)); + } + } + } + } + }, AWTEvent.MOUSE_EVENT_MASK); + } + + private void setMenuExpanded(boolean expanded) { + this.expanded = expanded; + for (JMenu m : menus) { + m.setVisible(expanded); + } + projectBtn.setVisible(!expanded); + branchBtn.setVisible(!expanded); + projectStrut.setVisible(!expanded); + branchStrut.setVisible(!expanded); + revalidate(); + repaint(); } public void setAlpha(float alpha) { @@ -36,45 +84,38 @@ private void initMenuBar() { add(appLogo); add(Box.createHorizontalStrut(5)); - // Hamburger Menu (Contains File, Edit, View, etc.) + // Hamburger Menu JButton menuBtn = new JButton(Icons.HAMBURGER); menuBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); - menuBtn.addActionListener(e -> { - JPopupMenu menu = new JPopupMenu(); - - // File Submenu - JMenu fileMenu = new JMenu("File"); - fileMenu.add(new JMenuItem("New Project...")); - fileMenu.add(new JMenuItem("Open Project...")); - fileMenu.addSeparator(); - fileMenu.add(new JMenuItem("Save Scene")); - menu.add(fileMenu); - - // Edit Submenu - JMenu editMenu = new JMenu("Edit"); - editMenu.add(new JMenuItem("Undo")); - editMenu.add(new JMenuItem("Redo")); - menu.add(editMenu); - - // View Submenu - JMenu viewMenu = new JMenu("View"); - viewMenu.add(new JCheckBoxMenuItem("Hierarchy", true)); - viewMenu.add(new JCheckBoxMenuItem("Inspector", true)); - menu.add(viewMenu); - - menu.addSeparator(); - menu.add(new JMenuItem("Settings...")); - menu.add(new JMenuItem("Exit")); - - menu.show(menuBtn, 0, menuBtn.getHeight()); - }); + menuBtn.addActionListener(e -> setMenuExpanded(!expanded)); add(menuBtn); add(Box.createHorizontalStrut(12)); + // Main Menus (Hidden by default) + menus.add(createFileMenu()); + menus.add(createEditMenu()); + menus.add(createMenu("View")); + menus.add(createMenu("Navigate")); + menus.add(createMenu("Code")); + menus.add(createMenu("Build")); + menus.add(createMenu("Run")); + menus.add(createMenu("Git")); + menus.add(createMenu("Window")); + menus.add(createMenu("Help")); + + for (JMenu m : menus) { + m.setVisible(false); + m.setFont(UIManager.getFont("defaultFont").deriveFont(Font.PLAIN, 12f)); + add(m); + } + // Project Info (Center-ish) String projectName = "New Adventure"; - JButton projectBtn = new JButton(projectName, new Icon() { + projectStrut = Box.createHorizontalStrut(10); + add(projectStrut); + + projectBtn = new JButton(projectName, new Icon() { @Override public void paintIcon(Component c, Graphics g, int x, int y) { Graphics2D g2 = (Graphics2D) g.create(); @@ -94,9 +135,10 @@ public void paintIcon(Component c, Graphics g, int x, int y) { projectBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); add(projectBtn); - add(Box.createHorizontalStrut(10)); + branchStrut = Box.createHorizontalStrut(10); + add(branchStrut); - JButton branchBtn = new JButton("master", Icons.GIT); + branchBtn = new JButton("master", Icons.GIT); branchBtn.putClientProperty(FlatClientProperties.BUTTON_TYPE, FlatClientProperties.BUTTON_TYPE_TOOLBAR_BUTTON); add(branchBtn); @@ -120,8 +162,32 @@ public void paintIcon(Component c, Graphics g, int x, int y) { add(settingsBtn); } + private JMenu createFileMenu() { + JMenu menu = new JMenu("File"); + menu.add(new JMenuItem("New Project...", Icons.PLUS)); + menu.add(new JMenuItem("Open Project...", Icons.FOLDER)); + menu.addSeparator(); + menu.add(new JMenuItem("Save Scene", Icons.CLIPBOARD)); + menu.addSeparator(); + menu.add(new JMenuItem("Settings...", Icons.SETTINGS)); + menu.add(new JMenuItem("Exit")); + return menu; + } + + private JMenu createEditMenu() { + JMenu menu = new JMenu("Edit"); + menu.add(new JMenuItem("Undo")); + menu.add(new JMenuItem("Redo")); + menu.addSeparator(); + menu.add(new JMenuItem("Cut")); + menu.add(new JMenuItem("Copy")); + menu.add(new JMenuItem("Paste")); + return menu; + } + private JMenu createMenu(String title) { JMenu menu = new JMenu(title); + menu.add(new JMenuItem("Placeholder Action")); return menu; } @@ -135,14 +201,14 @@ protected void paintComponent(Graphics g) { g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha)); } - // Focused Linear Glow: Starts slightly inward but fills from absolute left + // Focused Linear Glow Color glowColor = new Color(52, 152, 219); LinearGradientPaint p = new LinearGradientPaint( 0, 0, 500, 0, - new float[]{0.0f, 0.15f, 0.5f, 1.0f}, // Added step to start peak further right + new float[]{0.0f, 0.15f, 0.5f, 1.0f}, new Color[]{ - new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0), // Transparent at absolute left - new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 70), // Peak starts at ~75px + new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0), + new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 70), new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 25), new Color(glowColor.getRed(), glowColor.getGreen(), glowColor.getBlue(), 0) }