fix(flexbox): justify content calculations · NativeScript/NativeScript@d025c0e · GitHub

NativeScript / NativeScript Public

• Notifications You must be signed in to change notification settings
• Fork 1.7k
• Star 25.7k

• Code
• Issues 773
• Pull requests 69
• Discussions
• Actions
• Projects
• Wiki
• Security and quality
• Insights

Additional navigation options

Commit d025c0e

Browse filesBrowse the repository at this point in the historyBrowse files

vchimev

committed

fix(flexbox): justify content calculations

1 parent f3ea75f commit d025c0e
Copy full SHA for d025c0e

1 file changed

+12-12Lines changed: 12 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tns-core-modules/ui/layouts/flexbox-layout
  • flexbox-layout.ios.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts‎

Copy file name to clipboardExpand all lines: tns-core-modules/ui/layouts/flexbox-layout/flexbox-layout.ios.ts

+12-12Lines changed: 12 additions & 12 deletions

Original file line number	Diff line number	Diff line change
@@ -1003,24 +1003,24 @@ export class FlexboxLayout extends FlexboxLayoutBase {
1003	1003	childRight = width - paddingRight;
1004	1004	break;
1005	1005	case JustifyContent.FLEX_END:
1006		- childLeft = width - flexLine._mainSize + paddingRight;
1007		- childRight = flexLine._mainSize - paddingLeft;
	1006	+ childLeft = width - flexLine._mainSize - paddingRight;
	1007	+ childRight = flexLine._mainSize + paddingLeft;
1008	1008	break;
1009	1009	case JustifyContent.CENTER:
1010		- childLeft = paddingLeft + (width - flexLine._mainSize) / 2.0;
1011		- childRight = width - paddingRight - (width - flexLine._mainSize) / 2.0;
	1010	+ childLeft = paddingLeft + (width - insets.left - insets.right - flexLine._mainSize) / 2.0;
	1011	+ childRight = width - paddingRight - (width - insets.left - insets.right - flexLine._mainSize) / 2.0;
1012	1012	break;
1013	1013	case JustifyContent.SPACE_AROUND:
1014	1014	if (flexLine._itemCount !== 0) {
1015		- spaceBetweenItem = (width - flexLine.mainSize) / flexLine._itemCount;
	1015	+ spaceBetweenItem = (width - insets.left - insets.right - flexLine.mainSize) / flexLine._itemCount;
1016	1016	}
1017	1017	childLeft = paddingLeft + spaceBetweenItem / 2.0;
1018	1018	childRight = width - paddingRight - spaceBetweenItem / 2.0;
1019	1019	break;
1020	1020	case JustifyContent.SPACE_BETWEEN:
1021	1021	childLeft = paddingLeft;
1022	1022	let denominator = flexLine.itemCount !== 1 ? flexLine.itemCount - 1 : 1.0;
1023		- spaceBetweenItem = (width - flexLine.mainSize) / denominator;
	1023	+ spaceBetweenItem = (width - insets.left - insets.right - flexLine.mainSize) / denominator;
1024	1024	childRight = width - paddingRight;
1025	1025	break;
1026	1026	default:
@@ -1164,24 +1164,24 @@ export class FlexboxLayout extends FlexboxLayoutBase {
1164	1164	childBottom = height - paddingBottom;
1165	1165	break;
1166	1166	case JustifyContent.FLEX_END:
1167		- childTop = height - flexLine._mainSize + paddingBottom;
1168		- childBottom = flexLine._mainSize - paddingTop;
	1167	+ childTop = height - flexLine._mainSize - paddingBottom;
	1168	+ childBottom = flexLine._mainSize + paddingTop;
1169	1169	break;
1170	1170	case JustifyContent.CENTER:
1171		- childTop = paddingTop + (height - flexLine._mainSize) / 2.0;
1172		- childBottom = height - paddingBottom - (height - flexLine._mainSize) / 2.0;
	1171	+ childTop = paddingTop + (height - insets.top - insets.bottom - flexLine._mainSize) / 2.0;
	1172	+ childBottom = height - paddingBottom - (height - insets.top - insets.bottom - flexLine._mainSize) / 2.0;
1173	1173	break;
1174	1174	case JustifyContent.SPACE_AROUND:
1175	1175	if (flexLine._itemCount !== 0) {
1176		- spaceBetweenItem = (height - flexLine._mainSize) / flexLine.itemCount;
	1176	+ spaceBetweenItem = (height - insets.top - insets.bottom - flexLine._mainSize) / flexLine.itemCount;
1177	1177	}
1178	1178	childTop = paddingTop + spaceBetweenItem / 2.0;
1179	1179	childBottom = height - paddingBottom - spaceBetweenItem / 2.0;
1180	1180	break;
1181	1181	case JustifyContent.SPACE_BETWEEN:
1182	1182	childTop = paddingTop;
1183	1183	let denominator = flexLine.itemCount !== 1 ? flexLine.itemCount - 1 : 1.0;
1184		- spaceBetweenItem = (height - flexLine.mainSize) / denominator;
	1184	+ spaceBetweenItem = (height - insets.top - insets.bottom - flexLine.mainSize) / denominator;
1185	1185	childBottom = height - paddingBottom;
1186	1186	break;
1187	1187	default:

0 commit comments

Comments

0 (0)