diff --git a/ImageButtonInstance.cpp b/ImageButtonInstance.cpp index 3f91a43..c629d4f 100644 --- a/ImageButtonInstance.cpp +++ b/ImageButtonInstance.cpp @@ -54,8 +54,8 @@ void ImageButtonInstance::drawObj(RenderDevice* rd, Vector2 mousePos, bool mouse int renderimage = openGLID; if(disabled) { - if(openGLID_ds != 0) - renderimage = openGLID; + if(!image_ds.isNull()) + renderimage = openGLID_ds; } else if(mouseInArea(positionRelative.x, positionRelative.y, positionRelative.x + size.x, positionRelative.y + size.y, mousePos.x, mousePos.y)) { diff --git a/ImageButtonInstance.h b/ImageButtonInstance.h index c030afd..f5b40c6 100644 --- a/ImageButtonInstance.h +++ b/ImageButtonInstance.h @@ -4,9 +4,9 @@ class ImageButtonInstance : public BaseButtonInstance { public: - ImageButtonInstance(G3D::TextureRef); - ImageButtonInstance(G3D::TextureRef,G3D::TextureRef); - ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); + //ImageButtonInstance(G3D::TextureRef); + //ImageButtonInstance(G3D::TextureRef,G3D::TextureRef); + //ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); ~ImageButtonInstance(void); void drawObj(RenderDevice*, Vector2, bool); @@ -18,4 +18,6 @@ public: int openGLID_ovr; G3D::TextureRef image_dn; int openGLID_dn; + G3D::TextureRef image_ds; + int openGLID_ds; }; diff --git a/main.cpp b/main.cpp index 660150a..e6fa6b4 100644 --- a/main.cpp +++ b/main.cpp @@ -330,14 +330,11 @@ void initGUI() instance->position = Vector2(15, 90); instance->parent = dataModel; - 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"))); + 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"))); instance->size = Vector2(40,40); instance->position = Vector2(0, 140); instance->parent = dataModel; + instance = makeImageButton( Texture::fromFile(GetFileInPath("/content/images/MoveTool.png")),