Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions QMUIKit/QMUIComponents/QMUIAlertController.m
Original file line number Diff line number Diff line change
Expand Up @@ -604,11 +604,15 @@ - (void)viewDidLayoutSubviews {
}
}
if (!verticalLayout) {
// 对齐系统,先 add 的在右边,后 add 的在左边
QMUIAlertAction *leftAction = newOrderActions[1];
/**
* 对齐系统,先 add 的在右边,后 add 的在左边, 前提是存在 Cancel
* newOrderActions 已经是将Cancel 重排在最后了
*/
BOOL needSwap = (newOrderActions.firstObject.style == QMUIAlertActionStyleCancel) || (newOrderActions.lastObject.style == QMUIAlertActionStyleCancel);
QMUIAlertAction *leftAction = needSwap ? newOrderActions[1] : newOrderActions[0];
leftAction.button.frame = CGRectMake(0, contentOriginY, CGRectGetWidth(self.buttonScrollView.bounds) / 2, self.alertButtonHeight);
leftAction.button.qmui_borderPosition = QMUIViewBorderPositionRight;
QMUIAlertAction *rightAction = newOrderActions[0];
QMUIAlertAction *rightAction = needSwap ? newOrderActions[0] : newOrderActions[1];
rightAction.button.frame = CGRectMake(CGRectGetMaxX(leftAction.button.frame), contentOriginY, CGRectGetWidth(self.buttonScrollView.bounds) / 2, self.alertButtonHeight);
if (shouldShowSeparatorAtTopOfButtonAtFirstLine) {
leftAction.button.qmui_borderPosition |= QMUIViewBorderPositionTop;
Expand Down