Changeset 813

Timestamp:

02/03/14 15:04:16 (10 years ago)

Author:

csl14

Message:

Fullscreen webbrowser now gets actual width and height

Location:

trunk/src/org/expeditee

Files:

• actions/ExploratorySearchActions.java (modified) (2 diffs)
• actions/JfxBrowserActions.java (modified) (2 diffs)
• items/widgets/JfxBrowser.java (modified) (2 diffs)
• settings/exploratorysearch/ExploratorySearchSettings.java (modified) (2 diffs)

trunk/src/org/expeditee/actions/ExploratorySearchActions.java

@@ -57 +57 @@
                         text.setLink("" + frame.getNumber());                           // link this text item to new frame
                         
-                        // Remove everything from new page
+                        // Remove everything from new frame
                         frame.removeAllItems(frame.getItems());
                         
                         // Add web browser active overlay and @old
-                        //frame.addText(1100, 50, "@ao: 2", null, "overlayset2");
-                        //frame.addText(1100, 20, "@old", null);
-                        
                         Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset2");
                         t.setAnchorLeft(1087.0f);
@@ -79 +76 @@
                         // Start Browser in fullscreen or default, depending on settings
                         if(ExploratorySearchSettings.BrowserFullScreen.get()) {
-                                wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - 
-                                                JfxBrowser.HORZ_CROP - lm - rm) + " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - 
-                                                JfxBrowser.VERT_OFFSET - tm - bm) +     " : " + url, null);
+                                wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " 
+                                                + (Browser._theBrowser.getContentPane().getWidth() - lm - rm) + " " 
+                                                + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) 
+                                                + " : " + url, null);
                         } else {
                                 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " + 

trunk/src/org/expeditee/actions/JfxBrowserActions.java

@@ -50 +50 @@
                 wt.setParent(DisplayIO.getCurrentFrame());                      // set parent of text source for InteractiveWidget.createWidget()
                 wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                
                 // create widget from text item
                 JfxBrowser browser = (JfxBrowser) InteractiveWidget.createWidget(wt);
@@ -81 +82 @@
                 // Create JfxBrowser widget on a new frame
                 Frame frame = FrameIO.CreateNewFrame(text);                     // create new frame for browser
+                frame.removeAllItems(frame.getItems());
                 text.setLink("" + frame.getNumber());                           // link this text item to new frame
+                
                 // Create widget via text annotation
-                Text wt = frame.addText(0, JfxBrowser.VERT_OFFSET, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 
-                                 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - JfxBrowser.VERT_OFFSET) + " : ".concat(text.getText()), null);
+                Text wt = frame.addText(0, 0, "@iw: org.expeditee.items.widgets.JfxBrowser " 
+                                + Browser._theBrowser.getContentPane().getWidth() +  " " + Browser._theBrowser.getContentPane().getHeight() 
+                                + " : " + text.getText(), null);
+                
                 InteractiveWidget.createWidget(wt);
                 

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

@@ -62 +62 @@
         private static final String CONVERT = "convert";
         
-        public static final int VERT_OFFSET = 70;
-        public static final int VERT_CROP = 38;
-        public static final int HORZ_CROP = 16;
-        
         private JFXPanel _panel;
         private WebView _webView;
@@ -643 +639 @@
                 return r;
         }
-        
-        /**
-         * Override so anchoring JfxBrowser makes browser resize with screen
-         */
-        @Override
-        public void setAnchorLeft(Float anchor) {
-                
-        }
-        
-        /**
-         * Override so anchoring JfxBrowser makes browser resize with screen
-         */
-        @Override
-        public void setAnchorTop(Float anchor) {
-                
-        }
-        
-        /**
-         * Override so anchoring JfxBrowser makes browser resize with screen
-         */
-        @Override
-        public void setAnchorRight(Float anchor) {
-                
-        }
-        
-        /**
-         * Override so anchoring JfxBrowser makes browser resize with screen
-         */
-        @Override
-        public void setAnchorBottom(Float anchor) {
-                
-        }
 }

trunk/src/org/expeditee/settings/exploratorysearch/ExploratorySearchSettings.java

@@ -12 +12 @@
 public abstract class ExploratorySearchSettings {
         
+        // Vert offset for the JfxBrowser's position to work with the Exploratory Search web browser overlay
+        public static final int BROWSER_VERT_OFFSET = 70;
+        
         public static final BooleanSetting BrowserFullScreen = new BooleanSetting("Start Exploratory Search browser in fullscreen", true);
         
@@ -18 +21 @@
         public static final IntegerSetting BrowserDefaultHeight = new IntegerSetting("Default Browser height", 660);
         
-        public static final IntegerSetting BrowserLeftMargin = new IntegerSetting("Size of lefthand margin for Browser", 0);
+        public static final IntegerSetting BrowserLeftMargin = new IntegerSetting("Size of left hand margin for Browser", 0);
         
         public static final IntegerSetting BrowserRightMargin = new IntegerSetting("Size of right hand margin for Browser", 0);