Revision: 26074
http://sourceforge.net/p/bibdesk/svn/26074
Author: hofman
Date: 2021-05-25 16:57:45 +0000 (Tue, 25 May 2021)
Log Message:
-----------
First expand type table until limit, then expand item template view
Modified Paths:
--------------
trunk/bibdesk/BDSKTemplateDocument.m
Modified: trunk/bibdesk/BDSKTemplateDocument.m
===================================================================
--- trunk/bibdesk/BDSKTemplateDocument.m 2021-05-25 16:32:02 UTC (rev
26073)
+++ trunk/bibdesk/BDSKTemplateDocument.m 2021-05-25 16:57:45 UTC (rev
26074)
@@ -1184,20 +1184,23 @@
if (splitView == tableViewSplitView) {
NSView *view1 = [[splitView subviews] firstObject];
NSView *view2 = [[splitView subviews] lastObject];
- NSRect frame1 = [view1 frame];
- NSRect frame2 = [view2 frame];
- CGFloat width = NSWidth([splitView frame]) - [splitView
dividerThickness];
- CGFloat minWidth = [view2 fittingSize].width;
- frame1.size.width = fmax(NSWidth(frame1), [view1 fittingSize].width);
- frame2.size.width = width - NSWidth(frame1);
- if (frame2.size.width < minWidth) {
- frame2.size.width = minWidth;
- frame1.size.width = width - minWidth;
+ NSSize size1 = [view1 frame].size;
+ NSSize size2 = [view2 frame].size;
+ NSSize size = [splitView frame].size;
+ CGFloat divider = [splitView dividerThickness];
+ CGFloat minWidth1 = [view1 fittingSize].width;
+ CGFloat minWidth2 = [view2 fittingSize].width;
+ CGFloat dw = size.width - oldSize.width;
+ if (dw > 0.0 && size1.width < minWidth1)
+ size1.width = fmin(minWidth1, size1.width + dw);
+ size2.width = size.width - size1.width - divider;
+ if (size2.width < minWidth2) {
+ size2.width = minWidth2;
+ size1.width = size.width - minWidth2 - divider;
}
- frame1.size.height = frame2.size.height = NSHeight([splitView frame]);
- frame2.origin.x = NSWidth(frame1) + [splitView dividerThickness];
- [view1 setFrame:frame1];
- [view2 setFrame:frame2];
+ size1.height = size2.height = size.height;
+ [view1 setFrameSize:size1];
+ [view2 setFrameSize:size2];
}
[splitView adjustSubviews];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
