Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-03-06 14:27:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed SliderComponent going beyond its min/max values.

Browse source 
Defensive measures against a possible SVG reinitialization bug.
This commit is contained in:
Aloshi 2014-03-22 18:17:14 -05:00
parent d18140536a
commit cf836c0f8a
3 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/SliderComponent.cpp
View file

@ -85,10 +85,10 @@ void SliderComponent::render(const Eigen::Affine3f& parentTrans)
void SliderComponent::setValue(float value) void SliderComponent::setValue(float value)
{ {
mValue = value; mValue = value;
if(value < mMin) if(mValue < mMin)
value = mMin; mValue = mMin;
else if(value > mMax) else if(mValue > mMax)
value = mMax; mValue = mMax;
onValueChanged(); onValueChanged();
} }

15
src/resources/SVGResource.cpp
View file

@ -2,12 +2,14 @@
#include "../nanosvg/nanosvg.h" #include "../nanosvg/nanosvg.h"
#include "../nanosvg/nanosvgrast.h" #include "../nanosvg/nanosvgrast.h"
#include "../Log.h" #include "../Log.h"
#include "../Util.h"
#define DPI 96 #define DPI 96
SVGResource::SVGResource(const std::string& path, bool tile) : TextureResource(path, tile), mSVGImage(NULL) SVGResource::SVGResource(const std::string& path, bool tile) : TextureResource(path, tile), mSVGImage(NULL)
{ {
assert(tile == false); mLastWidth = 0;
mLastHeight = 0;
} }
SVGResource::~SVGResource() SVGResource::~SVGResource()
@ -40,11 +42,20 @@ void SVGResource::initFromMemory(const char* file, size_t length)
return; return;
} }
rasterizeAt((int)mSVGImage->width, (int)mSVGImage->height); if(mLastWidth && mLastHeight)
rasterizeAt(mLastWidth, mLastHeight);
else
rasterizeAt((int)round(mSVGImage->width), (int)round(mSVGImage->height));
} }
void SVGResource::rasterizeAt(size_t width, size_t height) void SVGResource::rasterizeAt(size_t width, size_t height)
{ {
if(width != (int)round(mSVGImage->width) && height != (int)round(mSVGImage->height))
{
mLastWidth = width;
mLastHeight = height;
}
if(!mSVGImage) if(!mSVGImage)
return; return;

2
src/resources/SVGResource.h
View file

@ -22,4 +22,6 @@ protected:
void deinitSVG(); void deinitSVG();
NSVGimage* mSVGImage; NSVGimage* mSVGImage;
size_t mLastWidth;
size_t mLastHeight;
}; };