Don't attempt to wrap cells that aren't deep enough

Author: parg

uis/src/com/biglybt/ui/swt/shells/GCStringPrinter.java

@@ -1247,7 +1247,7 @@ private Point drawText(GC gc, String s, int x, int y, int height,
 		return textExtent;
 	}
 
-	private static Point
+	public static Point
 	stringExtent(
 		GC		gc,
 		String	text )

uis/src/com/biglybt/ui/swt/subscriptions/SubscriptionsView.java

@@ -99,23 +99,19 @@ public class SubscriptionsView
 
 	private UISWTView swtView;
 
-	public SubscriptionsView() {
-
+	public 
+	SubscriptionsView() 
+	{
 	}
 
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.core.subs.SubscriptionManagerListener#associationsChanged(byte[])
-	 */
 	@Override
-	public void associationsChanged(byte[] association_hash) {
-		// TODO Auto-generated method stub
-
+	public void 
+	associationsChanged(
+		byte[] association_hash) 
+	{
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.core.subs.SubscriptionManagerListener#subscriptionSelected(com.biglybt.core.subs.Subscription)
-	 */
 	@Override
 	public void
 	subscriptionSelected(
@@ -131,28 +127,19 @@ public void associationsChanged(byte[] association_hash) {
 	{
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.core.subs.SubscriptionManagerListener#subscriptionAdded(com.biglybt.core.subs.Subscription)
-	 */
 	@Override
 	public void subscriptionAdded(Subscription subscription) {
 		if ( subscription.isSubscribed()){
 			view.addDataSource(subscription);
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.core.subs.SubscriptionManagerListener#subscriptionRemoved(com.biglybt.core.subs.Subscription)
-	 */
 	@Override
 	public void subscriptionRemoved(Subscription subscription) {
 		view.removeDataSource(subscription);
 
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.core.subs.SubscriptionManagerListener#subscriptionChanged(com.biglybt.core.subs.Subscription)
-	 */
 	@Override
 	public void subscriptionChanged(Subscription subscription, int reason) {
 		if ( !subscription.isSubscribed()){
@@ -173,9 +160,6 @@ public void subscriptionChanged(Subscription subscription, int reason) {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.pif.ui.UIPluginViewToolBarListener#refreshToolBarItems(java.util.Map)
-	 */
 	@Override
 	public void refreshToolBarItems(Map<String, Long> list) {
 		if ( view == null ){
@@ -186,9 +170,6 @@ public void refreshToolBarItems(Map<String, Long> list) {
 		list.put("share", numRows == 1 ? UIToolBarItem.STATE_ENABLED : 0);
 	}
 
-	/* (non-Javadoc)
-	 * @see com.biglybt.pif.ui.toolbar.UIToolBarActivationListener#toolBarItemActivated(ToolBarItem, long, java.lang.Object)
-	 */
 	@Override
 	public boolean toolBarItemActivated(ToolBarItem item, long activationType,
 	                                    Object datasource) {

uis/src/com/biglybt/ui/swt/views/table/painted/TableRowPainted.java

@@ -761,10 +761,6 @@ private boolean swt_paintCell(GC gc, Rectangle cellBounds,
 					cellBounds.width -= ofs;
 				}
 				//System.out.println("PS " + getIndex() + ";" + cellBounds + ";" + cell.getText());
-				int style = TableColumnSWTUtils.convertColumnAlignmentToSWT(column.getAlignment());
-				if (cellBounds.height > 20) {
-					style |= SWT.WRAP;
-				}
 				int textOpacity = cell.getTextAlpha();
 				//gc.setFont(getRandomFont());
 				//textOpacity = 130;
@@ -791,9 +787,22 @@ private boolean swt_paintCell(GC gc, Rectangle cellBounds,
 				cellBounds.y += 2;
 				cellBounds.height -= 4;
 				if (!cellBounds.isEmpty()) {
-					GCStringPrinter sp = new GCStringPrinter(gc, text, cellBounds, true,
-							cellBounds.height > 20, style);
+					
+					int singleLineHeight = GCStringPrinter.stringExtent( gc, text ).y;
+										
+					boolean worthWrap = cellBounds.height >= singleLineHeight*2;
+					
+					int style = TableColumnSWTUtils.convertColumnAlignmentToSWT(column.getAlignment());
+					
+					if ( worthWrap ){
+						
+						style |= SWT.WRAP;
+					}
 
+					GCStringPrinter sp = new GCStringPrinter(gc, text, cellBounds, true, worthWrap, style);
+
+					sp.calculateMetrics();
+					
 					if (shadowColor != null) {
 						Color oldFG = gc.getForeground();
 						gc.setForeground(shadowColor);