potential window fix
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				studiorailgun/Renderer/pipeline/head This commit looks good
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	studiorailgun/Renderer/pipeline/head This commit looks good
				
			This commit is contained in:
		
							parent
							
								
									bc29ea728e
								
							
						
					
					
						commit
						557b6da7de
					
				| @ -2068,6 +2068,7 @@ Fix string carousels | |||||||
| Fix sprint animation data | Fix sprint animation data | ||||||
| Color uniform on meshes | Color uniform on meshes | ||||||
| Fall and gravity tree fixes | Fall and gravity tree fixes | ||||||
|  | Potential window fix | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -94,13 +94,24 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme | |||||||
|      * NOTE: It should always be set to the current size of the window (width, height) |      * NOTE: It should always be set to the current size of the window (width, height) | ||||||
|      * NOTE: It is updated every time the applyYoga function is called |      * NOTE: It is updated every time the applyYoga function is called | ||||||
|      */ |      */ | ||||||
|     long parentWindowYogaNode = -1; |     long parentWindowYogaNode = Element.UNINITIALIZED_ID; | ||||||
| 
 | 
 | ||||||
|     /** |     /** | ||||||
|      * The frame decoration texture path |      * The frame decoration texture path | ||||||
|      */ |      */ | ||||||
|     String frameDecoration = AssetDataStrings.UI_FRAME_TEXTURE_DEFAULT_1; |     String frameDecoration = AssetDataStrings.UI_FRAME_TEXTURE_DEFAULT_1; | ||||||
| 
 | 
 | ||||||
|  |     public int width = 1; | ||||||
|  |     public int height = 1; | ||||||
|  |      | ||||||
|  |     public int absoluteX = 0; | ||||||
|  |     public int absoluteY = 0; | ||||||
|  |      | ||||||
|  |     public boolean visible = false; | ||||||
|  | 
 | ||||||
|  |     //the yoga node id | ||||||
|  |     long yogaNode = Element.UNINITIALIZED_ID; | ||||||
|  | 
 | ||||||
|     /** |     /** | ||||||
|      * Constructor |      * Constructor | ||||||
|      * @param showDecorations |      * @param showDecorations | ||||||
| @ -376,14 +387,6 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme | |||||||
|         Yoga.YGNodeStyleSetMinHeightPercent(yogaNode, percent); |         Yoga.YGNodeStyleSetMinHeightPercent(yogaNode, percent); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public int width = 1; |  | ||||||
|     public int height = 1; |  | ||||||
|      |  | ||||||
|     public int absoluteX = 0; |  | ||||||
|     public int absoluteY = 0; |  | ||||||
|      |  | ||||||
|     public boolean visible = false; |  | ||||||
| 
 |  | ||||||
|     public int getWidth() { |     public int getWidth() { | ||||||
|         return width; |         return width; | ||||||
|     } |     } | ||||||
| @ -432,9 +435,6 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme | |||||||
|         Yoga.YGNodeStyleSetMargin(this.yogaNode, Yoga.YGEdgeLeft, marginLeft); |         Yoga.YGNodeStyleSetMargin(this.yogaNode, Yoga.YGEdgeLeft, marginLeft); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     //the yoga node id |  | ||||||
|     long yogaNode = -1; |  | ||||||
| 
 |  | ||||||
|     @Override |     @Override | ||||||
|     public long getYogaNode() { |     public long getYogaNode() { | ||||||
|         return yogaNode; |         return yogaNode; | ||||||
| @ -634,6 +634,12 @@ public class Window implements DrawableElement, ContainerElement, NavigableEleme | |||||||
|         if(child.getParent() != null){ |         if(child.getParent() != null){ | ||||||
|             throw new Error("Child has a parent!"); |             throw new Error("Child has a parent!"); | ||||||
|         } |         } | ||||||
|  |         if(parentWindowYogaNode == Element.UNINITIALIZED_ID){ | ||||||
|  |             throw new Error("parent id undefined! " + parentWindowYogaNode); | ||||||
|  |         } | ||||||
|  |         if(yogaNode == Element.UNINITIALIZED_ID){ | ||||||
|  |             throw new Error("window yoga id undefined! " + yogaNode); | ||||||
|  |         } | ||||||
|         childList.add(child); |         childList.add(child); | ||||||
|         child.setParent(this); |         child.setParent(this); | ||||||
|         if(child instanceof DrawableElement){ |         if(child instanceof DrawableElement){ | ||||||
|  | |||||||
| @ -6,6 +6,11 @@ import electrosphere.renderer.ui.events.Event; | |||||||
| 
 | 
 | ||||||
| public interface Element { | public interface Element { | ||||||
| 
 | 
 | ||||||
|  |     /** | ||||||
|  |      * An uninitialized yoga node | ||||||
|  |      */ | ||||||
|  |     public static final long UNINITIALIZED_ID = -1; | ||||||
|  | 
 | ||||||
|     /** |     /** | ||||||
|      * A yoga element that either hasn't been created or has already been destroyed |      * A yoga element that either hasn't been created or has already been destroyed | ||||||
|      */ |      */ | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user