CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue with disabled images

Browse Source
This commit is contained in:
andreja6
2018-04-24 00:59:03 -07:00
parent 30aa99ff0b
commit 9ffe37c21a
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ImageButtonInstance.cpp
View File

@@ -54,8 +54,8 @@ void ImageButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouse
int renderimage = openGLID; int renderimage = openGLID;
if(disabled) if(disabled)
{ {
if(openGLID_ds != 0) if(!image_ds.isNull())
renderimage = openGLID; renderimage = openGLID_ds;
} }
else if(mouseInArea(positionRelative.x, positionRelative.y, positionRelative.x + size.x, positionRelative.y + size.y, mousePos.x, mousePos.y)) else if(mouseInArea(positionRelative.x, positionRelative.y, positionRelative.x + size.x, positionRelative.y + size.y, mousePos.x, mousePos.y))
{ {

8
ImageButtonInstance.h
View File

@@ -4,9 +4,9 @@
class ImageButtonInstance : public BaseButtonInstance class ImageButtonInstance : public BaseButtonInstance
{ {
public: public:
ImageButtonInstance(G3D::TextureRef); //ImageButtonInstance(G3D::TextureRef);
ImageButtonInstance(G3D::TextureRef,G3D::TextureRef); //ImageButtonInstance(G3D::TextureRef,G3D::TextureRef);
ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); //ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef,G3D::TextureRef);
~ImageButtonInstance(void); ~ImageButtonInstance(void);
void drawObj(RenderDevice*, Vector2, bool); void drawObj(RenderDevice*, Vector2, bool);
@@ -18,4 +18,6 @@ public:
int openGLID_ovr; int openGLID_ovr;
G3D::TextureRef image_dn; G3D::TextureRef image_dn;
int openGLID_dn; int openGLID_dn;
G3D::TextureRef image_ds;
int openGLID_ds;
}; };

7
main.cpp
View File

@@ -330,14 +330,11 @@ void initGUI()
instance->position = Vector2(15, 90); instance->position = Vector2(15, 90);
instance->parent = dataModel; instance->parent = dataModel;
instance = makeImageButton( instance = makeImageButton(Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
Texture::fromFile(GetFileInPath("/content/images/ScaleTool.png")),
Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ovr.png")),
Texture::fromFile(GetFileInPath("/content/images/ScaleTool_dn.png")),
Texture::fromFile(GetFileInPath("/content/images/ScaleTool_ds.png")));
instance->size = Vector2(40,40); instance->size = Vector2(40,40);
instance->position = Vector2(0, 140); instance->position = Vector2(0, 140);
instance->parent = dataModel; instance->parent = dataModel;
instance = makeImageButton( instance = makeImageButton(
Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")), Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),