Fix files view in classic UI

BiglySoftware · Apr 10, 2018 · bf879b1 · bf879b1
1 parent e48f185
commit bf879b1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/uis/src/com/biglybt/ui/swt/views/FilesView.java b/uis/src/com/biglybt/ui/swt/views/FilesView.java
@@ -233,6 +233,9 @@ TableManager.TABLE_TORRENT_FILES, getPropertiesPrefix(), basicItems,
 		if (allowTabViews) {
 	  		tv.setEnableTabViews(enable_tabs,true,null);
 		}
+
+		tv.setExpandEnabled( true );
+
 		basicItems = new TableColumnCore[0];
 
   		UIFunctionsSWT uiFunctions = UIFunctionsManagerSWT.getUIFunctionsSWT();

diff --git a/uis/src/com/biglybt/ui/swt/views/table/TableViewSWT.java b/uis/src/com/biglybt/ui/swt/views/table/TableViewSWT.java
@@ -245,6 +245,10 @@ void triggerDefaultSelectedListeners(TableRowCore[] selectedRows,
 
 	boolean isTabViewsEnabled();
 
+	public void setExpandEnabled( boolean b );
+
+	public boolean isExpandEnabled();
+
 	boolean getTabViewsExpandedByDefault();
 
 	String[] getTabViewsRestrictedTo();

diff --git a/uis/src/com/biglybt/ui/swt/views/table/impl/TableRowSWTBase.java b/uis/src/com/biglybt/ui/swt/views/table/impl/TableRowSWTBase.java
@@ -44,9 +44,6 @@ public abstract class TableRowSWTBase
 {
 	public static boolean DEBUG_ROW_PAINT = false;
 
-	private static final boolean expand_enabled = COConfigurationManager.getBooleanParameter("Table.useTree");
-
-
 	protected Object lock;
 
 	private final TableViewSWT tv;
@@ -522,7 +519,7 @@ public boolean isMouseOver() {
 	public boolean
 	canExpand()
 	{
-		return( expand_enabled );
+		return( tv.isExpandEnabled());
 	}
 
 	/* (non-Javadoc)

diff --git a/uis/src/com/biglybt/ui/swt/views/table/painted/TableViewPainted.java b/uis/src/com/biglybt/ui/swt/views/table/painted/TableViewPainted.java
@@ -30,6 +30,7 @@
 import org.eclipse.swt.layout.*;
 import org.eclipse.swt.widgets.*;
 
+import com.biglybt.core.config.COConfigurationManager;
 import com.biglybt.core.config.ParameterListener;
 import com.biglybt.core.internat.MessageText;
 import com.biglybt.core.internat.MessageText.MessageTextListener;
@@ -92,6 +93,8 @@ public class TableViewPainted
 
 	private static final boolean DEBUG_REDRAW_CLIP = false;
 
+	private static final boolean expand_enabled_default = COConfigurationManager.getBooleanParameter("Table.useTree");
+
 	private Composite cTable;
 
 	private int loopFactor;
@@ -176,6 +179,8 @@ public class TableViewPainted
 
 	private boolean	filterSubRows;
 
+	private boolean expandEnabled = expand_enabled_default;
+
 	private AtomicInteger	mutationCount 	= new AtomicInteger(0);
 	private int				lastMC			= -1;
 
@@ -1032,6 +1037,16 @@ public void runSupport() {
 	public boolean canHaveSubItems() {
 		return true;
 	}
+
+	public void setExpandEnabled( boolean b )
+	{
+		expandEnabled = b;
+	}
+
+	public boolean isExpandEnabled(){
+		return( expandEnabled );
+	}
+
 
 	/* (non-Javadoc)
 	 * @see TableView#setHeaderVisible(boolean)