Changeset 545

Timestamp:

11/27/13 16:18:26 (10 years ago)

Author:

ngw8

Message:

Added basic buttons to JfxBrowser, URL bar half works, others don't work at all. Removed code that explicitly resized the webview.

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (7 diffs)

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -1 +1 @@
 package org.expeditee.items.widgets;
 
+import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
 import java.io.File;
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -15 +16 @@
 import java.util.List;
 
+import javax.swing.JButton;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.JToolBar;
+import javax.swing.UIManager;
 
 import org.expeditee.gui.FreeItems;
@@ -125 +130 @@
                 Object webview;
                 Object jfxPanel;
+                JfxBrowser owner;
 
                 /**
@@ -131 +137 @@
                  */
                 public WebBrowserPanel(final String url) {
+
+                        super(new BorderLayout());
                         this.addComponentListener(this);
                         try {
                                 jfxPanel = JFXPanel.newInstance();
 
+                                // Toolbar (that can't be dragged) to hold the nav buttons, url bar, etc
+                                JToolBar toolBar = new JToolBar();
+                                toolBar.setFloatable(false);
+
+
+                                JButton backButton = new JButton("Back");
+                                toolBar.add(backButton);
+
+                                JButton forwardButton = new JButton("Forward");
+                                toolBar.add(forwardButton);
+
+                                JTextField urlField = new JTextField(url);
+                                toolBar.add(urlField);
+
+                                urlField.addActionListener(new ActionListener() {
+                                        @Override
+                                        public void actionPerformed(ActionEvent e) {
+                                                owner.navigate(e.getActionCommand());
+                                        }
+                                });
+
+                                add(toolBar, BorderLayout.PAGE_START);
+
                                 this.add((Component) jfxPanel);
-
-                                // Removing the gap between the top of the panel and the JFXPanel
-                                ((FlowLayout) this.getLayout()).setVgap(0);
 
                                 // Setting bg color to be the same as bg color of widgets when they're being dragged/resized
@@ -163 +191 @@
                         try {
                                 this.webview = WebView.newInstance();
-                                WebViewSetPrefSize.invoke(this.webview, this.getWidth(), this.getHeight());
 
                                 Object scene = SceneConstructor.newInstance(this.webview);
@@ -242 +269 @@
                 @Override
                 public void componentResized(ComponentEvent e) {
-                        // Webview is initialized in a 'run later' thread, so must check that it has actually been created before
-                        // trying to resize
-                        if (webview != null) {
-                                try {
-                                        WebViewSetPrefSize.invoke(this.webview, this.getWidth(), this.getHeight());
-                                } catch (Exception e1) {
-                                        e1.printStackTrace();
-                                }
-                        }
+                        // BorderLayout on the JPanel removes the need for explicitly resizing anything here
                 }
 
@@ -260 +279 @@
         public JfxBrowser(Text source, String[] args) {
                 // Initial page is either the page stored in the arguments (if there is one stored) or Google
-
-                // super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : "http://google.com"), -1, 500, -1, -1, 300, -1);
-                super(source, new WebBrowserPanel(args[0]), -1, 500, -1, -1, 300, -1);
+                super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : "http://google.com"), -1, 500, -1, -1, 300, -1);
                 _browser = (WebBrowserPanel) _swingComponent;
+                _browser.owner = this;
         }