fix for Spout's questionable new "no default height" warning for variable-sized text labels
also updated Bukkit lib
This commit is contained in:
		
							parent
							
								
									1e1925b43e
								
							
						
					
					
						commit
						f1114848ff
					
				
										
											Binary file not shown.
										
									
								
							@ -83,6 +83,7 @@ public class SpoutMainListener extends SpoutListener
 | 
				
			|||||||
			else
 | 
								else
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				label = new GenericLabel();
 | 
									label = new GenericLabel();
 | 
				
			||||||
 | 
									label.setWidth(1).setHeight(1);  // prevent Spout's questionable new "no default size" warning
 | 
				
			||||||
				label.setScale(Conf.spoutTerritoryDisplaySize);
 | 
									label.setScale(Conf.spoutTerritoryDisplaySize);
 | 
				
			||||||
/*				// this should work once the Spout team fix it to account for text scaling; we can then get rid of alignLabel method added below
 | 
					/*				// this should work once the Spout team fix it to account for text scaling; we can then get rid of alignLabel method added below
 | 
				
			||||||
				switch (Conf.spoutTerritoryDisplayPosition) {
 | 
									switch (Conf.spoutTerritoryDisplayPosition) {
 | 
				
			||||||
@ -116,6 +117,7 @@ public class SpoutMainListener extends SpoutListener
 | 
				
			|||||||
			else
 | 
								else
 | 
				
			||||||
			{
 | 
								{
 | 
				
			||||||
				label = new NoticeLabel(Conf.spoutTerritoryNoticeLeaveAfterSeconds);
 | 
									label = new NoticeLabel(Conf.spoutTerritoryNoticeLeaveAfterSeconds);
 | 
				
			||||||
 | 
									label.setWidth(1).setHeight(1);  // prevent Spout's questionable new "no default size" warning
 | 
				
			||||||
				label.setScale(Conf.spoutTerritoryNoticeSize);
 | 
									label.setScale(Conf.spoutTerritoryNoticeSize);
 | 
				
			||||||
				label.setY(Conf.spoutTerritoryNoticeTop);
 | 
									label.setY(Conf.spoutTerritoryNoticeTop);
 | 
				
			||||||
				sPlayer.getMainScreen().attachWidget(P.p, label);
 | 
									sPlayer.getMainScreen().attachWidget(P.p, label);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user