From 6ad2aec118583dd28b66e44d5fc044c2373d4f6d Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Tue, 22 Sep 2015 17:01:22 +0000 Subject: [PATCH] tweak --- contrib/mobile/iOS/Onelab/OptionsViewController.mm | 8 ++++---- contrib/mobile/iOS/Onelab/ParametersViewController.mm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/mobile/iOS/Onelab/OptionsViewController.mm b/contrib/mobile/iOS/Onelab/OptionsViewController.mm index 6890a680bc..8abb9386a8 100644 --- a/contrib/mobile/iOS/Onelab/OptionsViewController.mm +++ b/contrib/mobile/iOS/Onelab/OptionsViewController.mm @@ -141,8 +141,8 @@ case 0: { [cell setSelectionStyle:UITableViewCellSelectionStyleNone]; - UISwitch *showHideOptions = [[UISwitch alloc] initWithFrame: CGRectMake(15, 7, 100, 30)]; - UILabel *lblOptions = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHideOptions.frame.size.width), 10, (tableView.frame.size.width - (showHideOptions.frame.size.width) - 50), 30)]; + UISwitch *showHideOptions = [[UISwitch alloc] initWithFrame: CGRectMake(15, 6.5, 100, 30)]; + UILabel *lblOptions = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHideOptions.frame.size.width), 8, (tableView.frame.size.width - (showHideOptions.frame.size.width) - 50), 30)]; if(indexPath.row == 0) { [lblOptions setText:@"Show geometry points"]; [showHideOptions setOn:(CTX::instance()->geom.points)]; @@ -181,8 +181,8 @@ [cell setSelectionStyle:UITableViewCellSelectionStyleGray]; int i = PView::list.size() - 1 - indexPath.row; cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - UISwitch *showHide = [[UISwitch alloc] initWithFrame: CGRectMake(15, 7, 100, 30)]; - UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHide.frame.size.width), 10, (tableView.frame.size.width - showHide.frame.size.width - 50), 30)]; + UISwitch *showHide = [[UISwitch alloc] initWithFrame: CGRectMake(15, 6.5, 100, 30)]; + UILabel *lbl = [[UILabel alloc] initWithFrame:CGRectMake(25 + (showHide.frame.size.width), 8, (tableView.frame.size.width - showHide.frame.size.width - 50), 30)]; [showHide setOn:(PView::list[i]->getOptions()->visible == 1)]; [showHide setTag:i]; [showHide addTarget:self action:@selector(PViewVisible:) forControlEvents:UIControlEventValueChanged]; diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm index 08cfe1ce45..d647b95aca 100644 --- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm +++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm @@ -352,23 +352,23 @@ } else if([tmp isKindOfClass:[ParameterNumberCheckbox class]]) { ParameterNumberCheckbox *param = (ParameterNumberCheckbox *)tmp; - [param setLabelFrame:CGRectMake(85, 5, tableView.frame.size.width - 95, cell.frame.size.height/1.5)]; + [param setLabelFrame:CGRectMake(85, 10, tableView.frame.size.width - 95, cell.frame.size.height/2)]; [param setFrame:CGRectMake(20, 5, tableView.frame.size.width - 40, cell.frame.size.height)]; [cell addSubview:[param getCheckbox]]; } else if([tmp isKindOfClass:[ParameterNumberStepper class]]) { ParameterNumberStepper *param = (ParameterNumberStepper *)tmp; - [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/2.5)]; + [param setFrame:CGRectMake(20, cell.frame.size.height/2 + 5, tableView.frame.size.width - 40, cell.frame.size.height/2)]; [cell addSubview:[param getStepper]]; } else if([tmp isKindOfClass:[ParameterNumberRange class]]) { ParameterNumberRange *param = (ParameterNumberRange *)tmp; - [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/1.5)]; + [param setFrame:CGRectMake(20, cell.frame.size.height/2 + 10, tableView.frame.size.width - 40, cell.frame.size.height/2)]; [cell addSubview:[param getSlider]]; } else if([tmp isKindOfClass:[ParameterNumberTextbox class]]) { ParameterNumberTextbox *param = (ParameterNumberTextbox *)tmp; - [param setFrame:CGRectMake(20, cell.frame.size.height/2+5, tableView.frame.size.width - 40, cell.frame.size.height/1.75)]; + [param setFrame:CGRectMake(20, cell.frame.size.height/2 + 10, tableView.frame.size.width - 40, cell.frame.size.height/2)]; [cell addSubview:[param getTextbox]]; } -- GitLab