From 0aa9646b84350785dd719ab4e14ae5b82b36e288 Mon Sep 17 00:00:00 2001 From: Danila Fedorin Date: Wed, 26 Jul 2017 15:35:59 -0700 Subject: [PATCH] Temporarily move components into a tabbed pane. --- src/org/nwapw/abacus/window/Window.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/org/nwapw/abacus/window/Window.java b/src/org/nwapw/abacus/window/Window.java index 12ecda5..f6c4aec 100644 --- a/src/org/nwapw/abacus/window/Window.java +++ b/src/org/nwapw/abacus/window/Window.java @@ -163,8 +163,10 @@ public class Window extends JFrame { sidePanel.add(numberSystemPanel, BorderLayout.NORTH); sidePanel.add(functionSelectPanel, BorderLayout.SOUTH); - add(outputPanel, BorderLayout.CENTER); - add(sidePanel, BorderLayout.EAST); + JTabbedPane pane = new JTabbedPane(); + pane.add("Calculator", outputPanel); + pane.add("Settings", sidePanel); + add(pane, BorderLayout.CENTER); add(inputPanel, BorderLayout.SOUTH); ActionListener actionListener = (event) -> {