From 6958e5130f13597ff066e0d23dd717682bb7eb53 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 25 Jan 2005 21:19:28 +0000 Subject: [PATCH] Need to impose a _maximum_ width on edit boxes, as well as a minimum width; if allowed to resize to the text within them, they look terribly silly when containing an entire Rectangles or Pattern game ID. git-svn-id: svn://svn.tartarus.org/sgt/puzzles@5210 cda61777-01e9-0310-a592-d414129be87e --- osx.m | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/osx.m b/osx.m index 09aa99c..f1dfdc6 100644 --- a/osx.m +++ b/osx.m @@ -730,10 +730,6 @@ struct frontend { if (leftw < rect.size.width + 1) leftw = rect.size.width + 1; cfg_controls[cfg_ncontrols++] = tf; - /* We impose a minimum width on editable NSTextFields to - * stop them looking _completely_ silly. */ - if (rightw < 75) rightw = 75; - tf = [[NSTextField alloc] initWithFrame:tmprect]; [tf setEditable:YES]; [tf setSelectable:YES]; @@ -741,6 +737,17 @@ struct frontend { [[tf cell] setTitle:[NSString stringWithCString:i->sval]]; [tf sizeToFit]; rect = [tf frame]; + /* + * We impose a minimum and maximum width on editable + * NSTextFields. If we allow them to size themselves to + * the contents of the text within them, then they will + * look very silly if that text is only one or two + * characters, and equally silly if it's an absolutely + * enormous Rectangles or Pattern game ID! + */ + if (rect.size.width < 75) rect.size.width = 75; + if (rect.size.width > 400) rect.size.width = 400; + if (thish < rect.size.height + 1) thish = rect.size.height + 1; if (rightw < rect.size.width + 1) rightw = rect.size.width + 1; cfg_controls[cfg_ncontrols++] = tf; -- 2.11.0