Merge branch 'noWaterMark' into buttonSizeTweak
This commit is contained in:
commit
5db6aa0695
1 file changed
+2
-2
@@ -1272,8 +1272,8 @@ static float L3_Y;
|
|||||||
dzHalfWidth = _l2Button.bounds.size.width * 0.5 * _oscTapExlusionAreaSizeFactor;
|
dzHalfWidth = _l2Button.bounds.size.width * 0.5 * _oscTapExlusionAreaSizeFactor;
|
||||||
dzHalfHeight = _l2Button.bounds.size.height * 0.5 * _oscTapExlusionAreaSizeFactor;
|
dzHalfHeight = _l2Button.bounds.size.height * 0.5 * _oscTapExlusionAreaSizeFactor;
|
||||||
} else if ([key isEqualToString:@"dPad"]) {
|
} else if ([key isEqualToString:@"dPad"]) {
|
||||||
dzHalfWidth = _leftButton.bounds.size.width * 2; // dPad specially handled
|
dzHalfWidth = _leftButton.bounds.size.width * _oscTapExlusionAreaSizeFactor; // dPad specially handled
|
||||||
dzHalfHeight = _upButton.bounds.size.height * 2;
|
dzHalfHeight = _upButton.bounds.size.height * _oscTapExlusionAreaSizeFactor;
|
||||||
} else if ([key isEqualToString:@"selectButton"]) {
|
} else if ([key isEqualToString:@"selectButton"]) {
|
||||||
dzHalfWidth = _selectButton.bounds.size.width * 0.5 * _oscTapExlusionAreaSizeFactor;
|
dzHalfWidth = _selectButton.bounds.size.width * 0.5 * _oscTapExlusionAreaSizeFactor;
|
||||||
dzHalfHeight = _selectButton.bounds.size.height * 0.5 * _oscTapExlusionAreaSizeFactor;
|
dzHalfHeight = _selectButton.bounds.size.height * 0.5 * _oscTapExlusionAreaSizeFactor;
|
||||||
|
|||||||
Reference in new issue
Block a user