diff --git a/UI/Contacts/UIxContactsListViewContainer.m b/UI/Contacts/UIxContactsListViewContainer.m index d7da42448..ebfdbc700 100644 --- a/UI/Contacts/UIxContactsListViewContainer.m +++ b/UI/Contacts/UIxContactsListViewContainer.m @@ -147,7 +147,7 @@ [self _setupContext]; vertical = [moduleSettings objectForKey: @"DragHandleVertical"]; - return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil); + return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil); } - (NSString *) horizontalDragHandleStyle @@ -157,17 +157,17 @@ [self _setupContext]; horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"]; - return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil); + return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil); } - (NSString *) contactsListContentStyle { - int height; + NSString *height; - [self _setupContext]; - height = [[moduleSettings objectForKey: @"DragHandleVertical"] intValue]; + [self _setupContext]; + height = [moduleSettings objectForKey: @"DragHandleVertical"]; - return (height ? [NSString stringWithFormat: @"%ipx", (height - 27)] : nil); + return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil); } @end diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m index 669c078ea..b0956fdf9 100644 --- a/UI/MailerUI/UIxMailMainFrame.m +++ b/UI/MailerUI/UIxMailMainFrame.m @@ -270,7 +270,7 @@ [self _setupContext]; vertical = [moduleSettings objectForKey: @"DragHandleVertical"]; - return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil); + return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil); } - (NSString *) horizontalDragHandleStyle @@ -280,7 +280,7 @@ [self _setupContext]; horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"]; - return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil); + return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil); } - (NSString *) mailboxContentStyle @@ -290,7 +290,7 @@ [self _setupContext]; height = [moduleSettings objectForKey: @"DragHandleVertical"]; - return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil); + return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil); } - (WOResponse *) saveDragHandleStateAction diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m index c8af7875e..f470afaff 100644 --- a/UI/Scheduler/UIxCalMainView.m +++ b/UI/Scheduler/UIxCalMainView.m @@ -126,18 +126,22 @@ static NSMutableArray *yearMenuItems = nil; - (NSString *) verticalDragHandleStyle { + NSString *vertical; + [self _setupContext]; + vertical = [moduleSettings objectForKey: @"DragHandleVertical"]; - return [[moduleSettings objectForKey: @"DragHandleVertical"] - stringByAppendingString: @"px"]; + return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil); } - (NSString *) horizontalDragHandleStyle { - [self _setupContext]; + NSString *horizontal; - return [[moduleSettings objectForKey: @"DragHandleHorizontal"] - stringByAppendingString: @"px"]; + [self _setupContext]; + horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"]; + + return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil); } - (NSString *) eventsListViewStyle @@ -147,7 +151,7 @@ static NSMutableArray *yearMenuItems = nil; [self _setupContext]; height = [moduleSettings objectForKey: @"DragHandleVertical"]; - return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil); + return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil); } - (WOResponse *) saveDragHandleStateAction