comparison ios/dw.m @ 2430:e08968d21d45

iOS: Additional code to calculate spinbutton size. Spinbuttons on iOS are unusually large, don't use a specific value in dwtest... let the system decide so the spinbutton isn't clipped on iOS.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Mon, 05 Apr 2021 15:24:08 +0000
parents 89f4aba2e387
children 5e0507e67c5d
comparison
equal deleted inserted replaced
2429:89f4aba2e387 2430:e08968d21d45
3262 { 3262 {
3263 UIFont *font = [object font]; 3263 UIFont *font = [object font];
3264 3264
3265 if([object isEditable]) 3265 if([object isEditable])
3266 { 3266 {
3267 /* Spinbuttons don't need to be as wide */ 3267 /* Spinbutton text doesn't need to be as wide */
3268 if([handle isMemberOfClass:[DWSpinButton class]]) 3268 if([handle isMemberOfClass:[DWSpinButton class]])
3269 thiswidth = 100; 3269 thiswidth = 50;
3270 else 3270 else
3271 thiswidth = 150; 3271 thiswidth = 150;
3272 } 3272 }
3273 nsstr = [object text]; 3273 nsstr = [object text];
3274 3274
3275 if(font) 3275 if(font)
3276 thisheight = (int)[font lineHeight]; 3276 thisheight = (int)[font lineHeight];
3277
3278 /* Spinbuttons need some extra */
3279 if([handle isMemberOfClass:[DWSpinButton class]])
3280 {
3281 DWSpinButton *spinbutton = handle;
3282 CGSize size = [[spinbutton stepper] intrinsicContentSize];
3283
3284 /* Add the stepper width as extra... */
3285 extrawidth = size.width;
3286 /* The height should be the bigger of the two */
3287 if(size.height > thisheight)
3288 thisheight = size.height;
3289 }
3277 } 3290 }
3278 /* Handle the ranged widgets */ 3291 /* Handle the ranged widgets */
3279 else if([object isMemberOfClass:[DWPercent class]] || 3292 else if([object isMemberOfClass:[DWPercent class]] ||
3280 [object isMemberOfClass:[DWSlider class]]) 3293 [object isMemberOfClass:[DWSlider class]])
3281 { 3294 {