gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 21:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add updateSizeField: argument to -_trySelectSize:. Update callers.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19758 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2004-07-21 17:58:24 +00:00
parent ec389a2c20
commit 4e275e70cb
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-07-21 19:53 Alexander Malmberg <alexander@malmberg.org>
* Source/NSFontPanel.m (-_trySelectSize:updateSizeField:): Add
updateSizeField argument. Update callers.
2004-07-20 01:24 Alexander Malmberg <alexander@malmberg.org> 2004-07-20 01:24 Alexander Malmberg <alexander@malmberg.org>
* Source/NSScroller.m (-rectForPart:): Use floor() instead of * Source/NSScroller.m (-rectForPart:): Use floor() instead of

19
Source/NSFontPanel.m
View file

@ -83,7 +83,8 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
@interface NSFontPanel (Private) @interface NSFontPanel (Private)
- (NSFont*) _fontForSelection: (NSFont*) fontObject; - (NSFont*) _fontForSelection: (NSFont*) fontObject;
-(void) _trySelectSize: (float)size; -(void) _trySelectSize: (float)size
updateSizeField: (BOOL)updateSizeField;
// Some action methods // Some action methods
- (void) cancel: (id) sender; - (void) cancel: (id) sender;
@ -282,7 +283,7 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
} }
// show point size and select the row if there is one // show point size and select the row if there is one
[self _trySelectSize: size]; [self _trySelectSize: size updateSizeField: YES];
// Use in preview // Use in preview
[previewArea setFont: fontObject]; [previewArea setFont: fontObject];
@ -881,14 +882,18 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
-(void) _trySelectSize: (float)size -(void) _trySelectSize: (float)size
updateSizeField: (BOOL)updateSizeField
{ {
unsigned int i; unsigned int i;
NSBrowser *sizeBrowser = [[self contentView] viewWithTag: NSFPSizeBrowser]; NSBrowser *sizeBrowser = [[self contentView] viewWithTag: NSFPSizeBrowser];
NSTextField *sizeField; NSTextField *sizeField;
/* Make sure our sizeField is updated. */ if (updateSizeField)
sizeField = [[self contentView] viewWithTag: NSFPSizeField]; {
_setFloatValue (sizeField, size); /* Make sure our sizeField is updated. */
sizeField = [[self contentView] viewWithTag: NSFPSizeField];
_setFloatValue (sizeField, size);
}
/* Make sure our column is loaded. */ /* Make sure our column is loaded. */
[sizeBrowser loadColumnZero]; [sizeBrowser loadColumnZero];
@ -913,7 +918,7 @@ static float sizes[] = {4.0, 6.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0,
{ {
NSTextField *sizeField = [[self contentView] viewWithTag: NSFPSizeField]; NSTextField *sizeField = [[self contentView] viewWithTag: NSFPSizeField];
float size = [sizeField floatValue]; float size = [sizeField floatValue];
[self _trySelectSize: size]; [self _trySelectSize: size updateSizeField: NO];
[self _doPreview]; [self _doPreview];
} }
@ -1050,7 +1055,7 @@ static int score_difference(int weight1, int traits1,
if (size == 0.0) if (size == 0.0)
{ {
[self _trySelectSize: 12.0]; [self _trySelectSize: 12.0 updateSizeField: YES];
} }
} }