Changeset 1415 for trunk/src/org/expeditee/gui/DisplayController.java
- Timestamp:
- 07/24/19 11:23:45 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/DisplayController.java
r1413 r1415 583 583 // frames differ. 584 584 if (getCurrentFrame() != null && !bothSidesHaveSameFrame()) { 585 for (Item i : getCurrentFrame().get Items()) {585 for (Item i : getCurrentFrame().getSortedItems()) { 586 586 i.onParentStateChanged(new ItemParentStateChangedEvent(getCurrentFrame(), ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN)); 587 587 } … … 590 590 591 591 // BROOK : TODO... overlays and loadable widgets 592 for (Item i : getCurrentFrame().get Items()) {592 for (Item i : getCurrentFrame().getSortedItems()) { 593 593 i.onParentStateChanged(new ItemParentStateChangedEvent(getCurrentFrame(), ItemParentStateChangedEvent.EVENT_TYPE_SHOWN)); 594 594 } … … 671 671 } 672 672 673 for (Item i : frame.get Items()) {673 for (Item i : frame.getSortedItems()) { 674 674 i.onParentStateChanged(new ItemParentStateChangedEvent(frame, 675 675 ItemParentStateChangedEvent.EVENT_TYPE_SHOWN)); … … 925 925 StandardGestureActions.setHighlightHold(true); 926 926 927 for (Item i : frame.get Items()) {927 for (Item i : frame.getSortedItems()) { 928 928 if (i.getLink() != null && i.getAbsoluteLink().toLowerCase().equals(oldFrame)) { 929 929 if (i.getHighlightMode() != Item.HighlightMode.Normal) { … … 1131 1131 } else { 1132 1132 ToggleAudienceMode(); 1133 ItemUtils.UpdateConnectedToAnnotations(current.get Items());1133 ItemUtils.UpdateConnectedToAnnotations(current.getSortedItems()); 1134 1134 for (Overlay o : current.getOverlays()) { 1135 ItemUtils.UpdateConnectedToAnnotations(o.Frame.get Items());1135 ItemUtils.UpdateConnectedToAnnotations(o.Frame.getSortedItems()); 1136 1136 } 1137 1137 for (Vector v : current.getVectorsDeep()) { 1138 ItemUtils.UpdateConnectedToAnnotations(v.Frame.get Items());1138 ItemUtils.UpdateConnectedToAnnotations(v.Frame.getSortedItems()); 1139 1139 } 1140 1140 } … … 1207 1207 * This results in the Frame being re-parsed and repainted. 1208 1208 */ 1209 public static void ToggleXRayMode() 1210 { 1209 public static void ToggleXRayMode() { 1211 1210 // Turn off x-ray mode if it is on 1212 1211 if (_audienceMode) {
Note:
See TracChangeset
for help on using the changeset viewer.