Changeset 813 for trunk/src/org/expeditee/actions
- Timestamp:
- 02/03/14 15:04:16 (10 years ago)
- Location:
- trunk/src/org/expeditee/actions
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/actions/ExploratorySearchActions.java
r810 r813 57 57 text.setLink("" + frame.getNumber()); // link this text item to new frame 58 58 59 // Remove everything from new page59 // Remove everything from new frame 60 60 frame.removeAllItems(frame.getItems()); 61 61 62 62 // Add web browser active overlay and @old 63 //frame.addText(1100, 50, "@ao: 2", null, "overlayset2");64 //frame.addText(1100, 20, "@old", null);65 66 63 Text t = (Text) frame.addText(1100, 50, "@ao: 2", null, "overlayset2"); 67 64 t.setAnchorLeft(1087.0f); … … 79 76 // Start Browser in fullscreen or default, depending on settings 80 77 if(ExploratorySearchSettings.BrowserFullScreen.get()) { 81 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - 82 JfxBrowser.HORZ_CROP - lm - rm) + " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - 83 JfxBrowser.VERT_OFFSET - tm - bm) + " : " + url, null); 78 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " 79 + (Browser._theBrowser.getContentPane().getWidth() - lm - rm) + " " 80 + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) 81 + " : " + url, null); 84 82 } else { 85 83 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " + -
trunk/src/org/expeditee/actions/JfxBrowserActions.java
r766 r813 50 50 wt.setParent(DisplayIO.getCurrentFrame()); // set parent of text source for InteractiveWidget.createWidget() 51 51 wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY()); 52 52 53 // create widget from text item 53 54 JfxBrowser browser = (JfxBrowser) InteractiveWidget.createWidget(wt); … … 81 82 // Create JfxBrowser widget on a new frame 82 83 Frame frame = FrameIO.CreateNewFrame(text); // create new frame for browser 84 frame.removeAllItems(frame.getItems()); 83 85 text.setLink("" + frame.getNumber()); // link this text item to new frame 86 84 87 // Create widget via text annotation 85 Text wt = frame.addText(0, JfxBrowser.VERT_OFFSET, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 86 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - JfxBrowser.VERT_OFFSET) + " : ".concat(text.getText()), null); 88 Text wt = frame.addText(0, 0, "@iw: org.expeditee.items.widgets.JfxBrowser " 89 + Browser._theBrowser.getContentPane().getWidth() + " " + Browser._theBrowser.getContentPane().getHeight() 90 + " : " + text.getText(), null); 91 87 92 InteractiveWidget.createWidget(wt); 88 93
Note:
See TracChangeset
for help on using the changeset viewer.