Author: mlytwyn
Date: Fri Mar 10 23:10:08 2017
New Revision: 40382
URL: http://svn.gna.org/viewcvs/gnustep?rev=40382&view=rev
Log:
A better fix for incorrect column size on combo box items
Modified:
libs/gui/branches/gnustep_testplant_branch/Source/NSComboBoxCell.m
Modified: libs/gui/branches/gnustep_testplant_branch/Source/NSComboBoxCell.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/branches/gnustep_testplant_branch/Source/NSComboBoxCell.m?rev=40382&r1=40381&r2=40382&view=diff
==============================================================================
--- libs/gui/branches/gnustep_testplant_branch/Source/NSComboBoxCell.m
(original)
+++ libs/gui/branches/gnustep_testplant_branch/Source/NSComboBoxCell.m Fri Mar
10 23:10:08 2017
@@ -205,16 +205,6 @@
[super dealloc];
}
-- (void)setFrame:(NSRect)frameRect display:(BOOL)flag
-{
- [super setFrame: frameRect display: flag];
-
- // Column needs to track with frame size changes - and since this class
breaks
- // the GNUstep table view paradigm relationship (NSClipView/NSTableView) and
is
- // now resized outside the normal sequence we fudge it here...
- [[[_tableView tableColumns] objectAtIndex: 0] setWidth:
frameRect.size.width];
-}
-
- (void) layoutWithComboBoxCell: (NSComboBoxCell *)comboBoxCell
{
NSSize bsize = [[GSTheme theme] sizeForBorderType: NSLineBorder];
@@ -276,6 +266,11 @@
[self setFrame: [self frameRectForContentRect: NSMakeRect(0, 0, popUpWidth,
2 * bsize.height + (itemHeight + intercellSpacing.height) * (num - 1)
+ itemHeight)] display: NO];
+
+ // Column needs to track with frame size changes - and since this class
breaks
+ // the GNUstep table view paradigm relationship (NSClipView/NSTableView) and
is
+ // now resized outside the normal sequence we fudge it here...
+ [[[_tableView tableColumns] objectAtIndex: 0] setWidth: textCellWidth];
}
- (void) positionWithComboBoxCell: (NSComboBoxCell *)comboBoxCell
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
