Changeset 876

Timestamp:

02/10/14 16:02:59 (10 years ago)

Author:

csl14

Message:

Exploratory Search web browser now anchors to fullscreen + fixed bug with anchoring widgets

Location:

trunk/src/org/expeditee

Files:

• actions/ExploratorySearchActions.java (modified) (1 diff)
• actions/JfxBrowserActions.java (modified) (2 diffs)
• gui/FrameMouseActions.java (modified) (1 diff)
• items/widgets/InteractiveWidget.java (modified) (5 diffs)
• settings/exploratorysearch/ExploratorySearchSettings.java (modified) (1 diff)

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

@@ -77 +77 @@
                         if(ExploratorySearchSettings.BrowserFullScreen.get()) {
                                 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " 
+                                                + ("--anchorLeft " + lm + " --anchorRight " + rm + " --anchorTop " + (tm + ExploratorySearchSettings.BROWSER_VERT_OFFSET) + " --anchorBottom " + bm + " ")
                                                 + (Browser._theBrowser.getContentPane().getWidth() - lm - rm) + " " 
-                                                + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) 
-                                                + " : " + url, null);
+                                                + (Browser._theBrowser.getContentPane().getHeight() - ExploratorySearchSettings.BROWSER_VERT_OFFSET - tm - bm) + " : " + url, null);
+                                System.err.println(wt.getText());
                         } else {
                                 wt = frame.addText(0 + lm, 70 + tm, "@iw: org.expeditee.items.widgets.JfxBrowser " + 

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

@@ -26 +26 @@
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.JfxBrowser;
+import org.expeditee.settings.exploratorysearch.ExploratorySearchSettings;
 import org.expeditee.settings.network.NetworkSettings;
 import org.json.simple.JSONObject;
@@ -103 +104 @@
                 // Create widget via text annotation
                 Text wt = frame.addText(0, 0, "@iw: org.expeditee.items.widgets.JfxBrowser " 
+                                + ("--anchorLeft 0 --anchorRight 0 --anchorTop 0 --anchorBottom 0 ")
                                 + Browser._theBrowser.getContentPane().getWidth() +  " " + Browser._theBrowser.getContentPane().getHeight() 
                                 + " : " + text.getText(), null);

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -749 +749 @@
                         }
                 }
-
+                
                 // If the user clicked into a widgets free space...
                 if (clicked == null && _lastClickedIn != null

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

@@ -866 +866 @@
 
                 if (_anchorLeft != null) {
-                    sb.append(" -anchorLeft " + Math.round(_anchorLeft));
+                    sb.append(" --anchorLeft " + Math.round(_anchorLeft));
                 }
                 if (_anchorRight != null) {
-                    sb.append(" -anchorRight " + Math.round(_anchorRight));
+                    sb.append(" --anchorRight " + Math.round(_anchorRight));
                 }
 
                 if (_anchorTop != null) {
-                    sb.append(" -anchorTop " + Math.round(_anchorTop));
+                    sb.append(" --anchorTop " + Math.round(_anchorTop));
                 }
 
                 if (_anchorBottom != null) {
-                    sb.append(" -anchorBottom " + Math.round(_anchorBottom));
+                    sb.append(" --anchorBottom " + Math.round(_anchorBottom));
                 }
 
@@ -2001 +2001 @@
                 }
                 
-                // Move X-rayable items as well
-                getSource().setAnchorLeft(anchor);
+                // Move X-rayable item as well
+                getCurrentRepresentation().setAnchorLeft(anchor);
         }
 
@@ -2018 +2018 @@
                 if (_anchorLeft == null) {
                         // Prefer having the X-rayable item at anchorLeft position (if defined) over moving to anchorRight
-                        getSource().setAnchorRight(anchor);
+                        getCurrentRepresentation().setAnchorRight(anchor);
                 }
         }
@@ -2033 +2033 @@
                 }
         
-                // Move X-rayable items as well
-                getSource().setAnchorTop(anchor);
+                // Move X-rayable item as well
+                getCurrentRepresentation().setAnchorTop(anchor);
         }
 
@@ -2050 +2050 @@
                 if (_anchorTop == null) {
                     // Prefer having the X-rayable item at anchorTop position (if defined) over moving to anchorBottom
-                    getSource().setAnchorBottom(anchor);
+                        getCurrentRepresentation().setAnchorBottom(anchor);
                 }
         }

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

@@ -17 +17 @@
         public static final BooleanSetting BrowserFullScreen = new BooleanSetting("Start Exploratory Search browser in fullscreen", true);
         
-        public static final IntegerSetting BrowserDefaultWidth = new IntegerSetting("Default Browser width", 1008);
+        public static final IntegerSetting BrowserDefaultWidth = new IntegerSetting("Default Browser width", 800);
         
-        public static final IntegerSetting BrowserDefaultHeight = new IntegerSetting("Default Browser height", 660);
+        public static final IntegerSetting BrowserDefaultHeight = new IntegerSetting("Default Browser height", 600);
         
         public static final IntegerSetting BrowserLeftMargin = new IntegerSetting("Size of left hand margin for Browser", 0);