Changeset 292 for trunk/src/org/expeditee/gui/FrameCreator.java

Timestamp:

09/03/08 14:43:49 (16 years ago)

Author:

ra33

Message:

Restored multicolumn searchresults

File:

• trunk/src/org/expeditee/gui/FrameCreator.java (modified) (3 diffs)

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

@@ -35 +35 @@
         private Frame _firstFrame;
 
+        private boolean _multiColumn;
+
         public FrameCreator(String frameTitle) {
                 this(DisplayIO.getCurrentFrame().getFramesetName(), DisplayIO
-                                .getCurrentFrame().path, frameTitle, false);
+                                .getCurrentFrame().path, frameTitle, false, false);
         }
 
@@ -81 +83 @@
 
         public FrameCreator(String name, String path, String frameTitle,
-                        boolean recreate) {
-
+                        boolean recreate, boolean multiColumn) {
+                _multiColumn = multiColumn;
                 _Mnext = createButton("@Next", null, null, 10F, 15F);
 
@@ -178 +180 @@
                                 // if there is no more room on the X axis, we have to start a
                                 // new frame
-                                // if (toAdd.getBoundsWidth() + _lastX > FrameGraphics
-                                // .getMaxSize().width) {
-                                // Make sure text items that are created on the current
-                                // frame are removed
-                                _current.removeItem(toAdd);
-                                createNextFrame();
-                                // }
+                                if (!_multiColumn || toAdd.getBoundsWidth() + _lastX > FrameGraphics
+                                                .getMaxSize().width) {
+                                        // Make sure text items that are created on the current
+                                        // frame are removed
+                                        _current.removeItem(toAdd);
+                                        createNextFrame();
+                                }
                         }