X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.browsing.ui.nattable%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fnattable%2FNatTableGraphExplorer.java;fp=bundles%2Forg.simantics.browsing.ui.nattable%2Fsrc%2Forg%2Fsimantics%2Fbrowsing%2Fui%2Fnattable%2FNatTableGraphExplorer.java;h=cc978e7e8b6ce599957ff6fbb859c76ec96a0d96;hp=5726b51303879cf301b94ad1b3256dfad2938b18;hb=8cf8163295ffc6b25dfdebc3dc89467c56684da1;hpb=f62fffe40c30154686703c6ea9d8a319ba0ae9f6

diff --git a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
index 5726b5130..cc978e7e8 100644
--- a/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
+++ b/bundles/org.simantics.browsing.ui.nattable/src/org/simantics/browsing/ui/nattable/NatTableGraphExplorer.java
@@ -1517,10 +1517,14 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 		columnAccessor = new GEColumnAccessor(this);
 		
 		IDataProvider dataProvider = new ListDataProvider<TreeNode>(list, columnAccessor);
-		
-		int defaultFontSize = 12;
-		int height = (int)Math.ceil(((double)(defaultFontSize))*getDisplayScale()) + DataLayer.DEFAULT_ROW_HEIGHT-defaultFontSize;
-		dataLayer = new DataLayer(dataProvider, DataLayer.DEFAULT_COLUMN_WIDTH, height);
+
+//      FIXME: NatTable 1.0 required help to work with custom display scaling (Windows 7 display scaling). 
+//             It seems that NatTable 1.4 breaks with the same code in Windows 7, so now the code is disabled.
+//             More testing with different hardware is required...		
+//		int defaultFontSize = 12;
+//		int height = (int)Math.ceil(((double)(defaultFontSize))*getDisplayScale()) + DataLayer.DEFAULT_ROW_HEIGHT-defaultFontSize;
+//		dataLayer = new DataLayer(dataProvider, DataLayer.DEFAULT_COLUMN_WIDTH, height);
+		dataLayer = new DataLayer(dataProvider);
 		
 		// resizable rows are unnecessary in Sulca report.
 		dataLayer.setRowsResizableByDefault(false);
@@ -1535,7 +1539,7 @@ public class NatTableGraphExplorer extends GraphExplorerImplBase implements Grap
 		// Column header layer
 		columnHeaderDataProvider = new GEColumnHeaderDataProvider(this, dataLayer); 
 		columnHeaderDataLayer = new DefaultColumnHeaderDataLayer(columnHeaderDataProvider);
-		columnHeaderDataLayer.setDefaultRowHeight(height);
+		//columnHeaderDataLayer.setDefaultRowHeight(height);
 		columnHeaderDataProvider.updateColumnSizes();
 		
 		//ISortModel sortModel = new EcoSortModel(this, generator,dataLayer);