Explorar o código

Merge pull request #1686 from louis-mclaughlin/joystick_width_patch

Fixed joystick width being set to height
Sean Taylor %!s(int64=11) %!d(string=hai) anos
pai
achega
406c0e40cf
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      gameplay/src/JoystickControl.cpp

+ 1 - 1
gameplay/src/JoystickControl.cpp

@@ -279,7 +279,7 @@ void JoystickControl::updateAbsoluteSizes()
 
 
         *_outerSizePixels = _outerRegionCoord ? getPixelSize(*_outerRegionCoord, _outerRegionCoordBoundsBits) : getPixelSize(outerImage);
         *_outerSizePixels = _outerRegionCoord ? getPixelSize(*_outerRegionCoord, _outerRegionCoordBoundsBits) : getPixelSize(outerImage);
         _screenRegionPixels.width = _outerSizePixels->x > _screenRegionPixels.width ? _outerSizePixels->x : _screenRegionPixels.width;
         _screenRegionPixels.width = _outerSizePixels->x > _screenRegionPixels.width ? _outerSizePixels->x : _screenRegionPixels.width;
-        _screenRegionPixels.width = _outerSizePixels->y > _screenRegionPixels.height ? _outerSizePixels->y : _screenRegionPixels.height;
+        _screenRegionPixels.height = _outerSizePixels->y > _screenRegionPixels.height ? _outerSizePixels->y : _screenRegionPixels.height;
     }
     }
 
 
     _radiusPixels = std::max(1.0f, _boundsBits & BOUNDS_RADIUS_PERCENTAGE_BIT ?
     _radiusPixels = std::max(1.0f, _boundsBits & BOUNDS_RADIUS_PERCENTAGE_BIT ?