Fix for issue 5, yet again

Author: skypanther

app/config.json

@@ -9,6 +9,6 @@
 	"os:mobileweb": {},
 	"os:windows": {},
 	"dependencies": {
-		"com.skypanther.segmentedcontrol": "1.0.4"
+		"com.skypanther.segmentedcontrol": "1.0.5"
 	}
 }

app/widgets/com.skypanther.segmentedcontrol/controllers/widget.js

@@ -50,7 +50,7 @@ exports.init = function (labels, cb) {
 	} else if (OS_IOS) {
 		if ($.segCtrlWrapper.width.slice(-1) === '%') {
 			calculatedWidth = Ti.Platform.displayCaps.platformWidth * parseInt($.segCtrlWrapper.width) / 100;
-			console.log('Calculated the width of ' + args.id + ' to be ' + calculatedWidth);
+			// console.log('Calculated the width of ' + args.id + ' to be ' + calculatedWidth);
 		} else if (isNaN(parseInt($.segCtrlWrapper.width))) {
 			// iOS handles rotation, but the wrapper width needs to be calculated to be
 			// the smaller of the height or width to avoid layout issues
@@ -69,10 +69,11 @@ exports.init = function (labels, cb) {
 
 	// make our buttons
 	for (var i = 0, j = labels.length; i < j; i++) {
-		if (!wrapperWidthIsCalculated && i === j - 1 && !ios8Plus()) {
+		if (!wrapperWidthIsCalculated && i === j - 1 && !onThreeDPDevice()) {
 			// if an explicit width has been set, we need to shrink the last button
 			// by 1 or it will be too wide for the container and won't be shown
 			btnWidth = (parseInt(btnWidth) - 1);
+
 			if (OS_ANDROID) {
 				btnWidth += 'dp';
 			}
@@ -97,11 +98,13 @@ exports.init = function (labels, cb) {
 
 	// add the button dividers, if desired
 	if (args.withDividers) {
+		var left;
 		for (var i = 0, j = labels.length - 1; i < j; i++) { // jshint ignore:line
+			left = OS_ANDROID ? ((parseInt(btnWidth) * (i + 1) + 1) + 'dp') : (btnWidth * (i + 1) + (!onThreeDPDevice() ? 1 : -1));
 			$.segCtrlWrapper.add(Ti.UI.createView({
 				width: OS_ANDROID ? '1dp' : 1,
 				height: height,
-				left: OS_ANDROID ? ((parseInt(btnWidth) * (i + 1) + 1) + 'dp') : (btnWidth * (i + 1) + (!ios8Plus() ? 1 : -1)),
+				left: left,
 				backgroundColor: selectedButtonColor,
 				zIndex: 10
 			}));
@@ -232,10 +235,7 @@ exports.enableAllButtons = function () {
 };
 
 
-function ios8Plus() {
-	if (OS_IOS && parseInt(Ti.Platform.version.split(".")[0]) >= 7) {
-		return true;
-	} else {
-		return false;
-	}
+function onThreeDPDevice() {
+	//if we are on a 3DP device (6+ or 6s+) we need to slightly adjust the button width
+	return OS_IOS && parseInt(Ti.Platform.displayCaps.logicalDensityFactor) === 3;
 }

app/widgets/com.skypanther.segmentedcontrol/widget.json

@@ -3,7 +3,7 @@
 	"name": "com.skypanther.segmentedcontrol",
 	"description": "Cross-platform tabbed bar (segmented control) component for Appcelerator Titanium Alloy projects.",
 	"author": "Tim Poulsen, @skypanther",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"copyright": "Copyright (c) 2016, Tim Poulsen",
 	"license": "MIT",
 	"min-alloy-version": "1.5.1",

readme.md

@@ -25,7 +25,7 @@ $ gittio install com.skypanther.segmentedcontrol
 
 ```json
 "dependencies": {
-    "com.skypanther.segmentedcontrol": "1.0.4"
+    "com.skypanther.segmentedcontrol": "1.0.5"
 }
 ```
 
@@ -99,7 +99,8 @@ Additionally, most other properties you set on the widget (via its xml tag or id
 
 # History
 
-* 29-Feb-2016: Ver 1.0.3 resolves #5, thanks Will Dent! (last button in set not filling entire area on iPhone 6s+)
+* 3-Mar-2016: Ver 1.0.5 resolves #5, yet another attempt! (it would help if I owned more iOS devices, donations welcome 😀)
+* 29-Feb-2016: Ver 1.0.4 resolves #5, thanks Will Dent! (last button in set not filling entire area on iPhone 6s+)
 * 16-Feb-2016: Ver 1.0.3 resolves last button in set not filling entire area on iPhone 6s+
 * 08-Feb-2016: Ver 1.0.2 resolves issue where selecting/setIndexing a button didn't deselect the other buttons
 * 05-Feb-2016: Ver 1.0.1 resolves layout issues on larger iOS devices when using percentage-based widths