Changeset 1511 for trunk/src/org/expeditee/gui/FrameUtils.java
- Timestamp:
- 02/19/20 10:44:38 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gui/FrameUtils.java
r1508 r1511 71 71 import org.expeditee.items.Item; 72 72 import org.expeditee.items.Item.HighlightMode; 73 import org.expeditee.items.ItemParentStateChangedEvent; 73 74 import org.expeditee.items.ItemUtils; 74 75 import org.expeditee.items.JSItem; … … 680 681 * @param txt 681 682 * Text to create the widget from. Must not be null. 683 * @param userEdit True if createWidget is being called because a user has made a edit, false otherwise. 682 684 * 683 685 * @return True if created/added. False if could not create. … … 685 687 * @author Brook Novak 686 688 */ 687 private static boolean createWidget(Frame frame, Text txt, ItemsList list ) {689 private static boolean createWidget(Frame frame, Text txt, ItemsList list, boolean userEdit) { 688 690 689 691 if (frame == null) { … … 723 725 724 726 frame.addAllItems(iw.getItems(), list); 727 728 if (userEdit) { 729 iw.onParentStateChanged(new ItemParentStateChangedEvent(frame, ItemParentStateChangedEvent.EVENT_TYPE_SHOWN)); 730 } 725 731 726 732 return true; … … 728 734 729 735 private static boolean createWidgetInBody(Frame frame, Text txt) { 730 return createWidget(frame, txt, frame.getBody(false) );736 return createWidget(frame, txt, frame.getBody(false), false); 731 737 } 732 738 … … 889 895 } 890 896 891 private static void transformOutOfPlaceItems(Frame toParse, ItemsList toTransform ) {897 private static void transformOutOfPlaceItems(Frame toParse, ItemsList toTransform, boolean sendWidgetVisible) { 892 898 // Get all items from toTransform that have not been marked as deleted. 893 899 List<Item> items = toParse.getItems(false, toTransform); … … 988 994 // Check for interactive widgets 989 995 } else if (ItemUtils.startsWithTag(i, ItemUtils.TAG_IWIDGET)) { 990 createWidget(toParse, (Text) i, toTransform );996 createWidget(toParse, (Text) i, toTransform, sendWidgetVisible); 991 997 } 992 998 … … 1149 1155 */ 1150 1156 public static void Parse(Frame toParse, boolean firstParse) { 1151 Parse(toParse, firstParse, false );1157 Parse(toParse, firstParse, false, false); 1152 1158 } 1153 1159 … … 1160 1166 * an ao tag linked to a frame with an frameImage of a frame which 1161 1167 * also has an ao tag on it. 1168 * @param userEdit TODO 1162 1169 */ 1163 public static void Parse(Frame toParse, boolean firstParse, boolean ignoreAnnotations ) {1170 public static void Parse(Frame toParse, boolean firstParse, boolean ignoreAnnotations, boolean userEdit) { 1164 1171 List<String> accessList = Label.getAccessibleLabelsNames(toParse.getPrimaryBody()); 1165 1172 … … 1167 1174 ItemsList surrogates = toParse.getSurrogateBody(); 1168 1175 1169 transformOutOfPlaceItems(toParse, primaries );1170 transformOutOfPlaceItems(toParse, surrogates );1176 transformOutOfPlaceItems(toParse, primaries, userEdit); 1177 transformOutOfPlaceItems(toParse, surrogates, userEdit); 1171 1178 1172 1179 toParse.getInteractableItems().clear(); … … 1801 1808 if (!DisplayController.isXRayMode()) { 1802 1809 if (toReparse != null) { 1803 Parse(toReparse, false, false );1810 Parse(toReparse, false, false, true); 1804 1811 } else { 1805 1812 if (toRecalculate != null) {
Note:
See TracChangeset
for help on using the changeset viewer.