From c0ee5f6563e14490e145df9f00484e23ca29abc7 Mon Sep 17 00:00:00 2001
From: Didier Korthoudt <didier.korthoudt@ulg.ac.be>
Date: Wed, 22 Aug 2018 09:41:37 +0200
Subject: [PATCH] Fixed: Problem with nib2cib introduced by #2758 (#2763)

---
 Tools/nib2cib/NSTableHeaderView.j | 23 +++++++++--------------
 Tools/nib2cib/NSTableView.j       |  7 +++++++
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Tools/nib2cib/NSTableHeaderView.j b/Tools/nib2cib/NSTableHeaderView.j
index f903807d5..63f1b609b 100644
--- a/Tools/nib2cib/NSTableHeaderView.j
+++ b/Tools/nib2cib/NSTableHeaderView.j
@@ -23,31 +23,26 @@
 @import <AppKit/CPTableHeaderView.j>
 
 @class CPTableView
-@class Nib2Cib
-
 
 @implementation CPTableHeaderView (NSCoding)
 
 - (id)NS_initWithCoder:(CPCoder)aCoder
 {
     if (self = [super NS_initWithCoder:aCoder])
-    {
         _tableView = [aCoder decodeObjectForKey:"NSTableView"];
 
-        // change the default height
-        if (_bounds.size.height === 17)
-        {
-            var theme = [Nib2Cib defaultTheme],
-                height = [theme valueForAttributeWithName:@"header-view-height" forClass:CPTableView];
-
-            _bounds.size.height = height;
-            _frame.size.height = height;
-        }
-    }
-
     return self;
 }
 
+- (void)_setHeightIfDefaultValue:(CPInteger)height
+{
+    if (_bounds.size.height === 17)
+    {
+        _bounds.size.height = height;
+        _frame.size.height = height;
+    }
+}
+
 @end
 
 @implementation NSTableHeaderView : CPTableHeaderView
diff --git a/Tools/nib2cib/NSTableView.j b/Tools/nib2cib/NSTableView.j
index 3b4da3f54..e8de111b7 100644
--- a/Tools/nib2cib/NSTableView.j
+++ b/Tools/nib2cib/NSTableView.j
@@ -86,6 +86,13 @@
         _allowsColumnReordering = (flags & 0x80000000) ? YES : NO;
 
         [self setBackgroundColor:[aCoder decodeObjectForKey:@"NSBackgroundColor"]];
+
+        var headerViewHeight = [theme valueForAttributeWithName:@"header-view-height" forClass:CPTableView];
+
+        if (!headerViewHeight)
+            headerViewHeight = [self currentValueForThemeAttribute:@"header-view-height"];
+
+        [_headerView _setHeightIfDefaultValue:headerViewHeight];
     }
 
     return self;