summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2017-04-16 12:55:19 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2017-04-16 12:55:19 +0200
commit7c074d96d8b6c93bf76bb093aab124c267287668 (patch)
tree65e92d332034cf4670e260d66aed6c6bfd2f9f67
parent19b9cddf7d5ef3daac5cda481db492f28574d28d (diff)
Fix bug in TexturedBox where width and height were wrong.
-rw-r--r--plugingui/texturedbox.cc2
-rw-r--r--plugingui/texturedbox.h4
2 files changed, 4 insertions, 2 deletions
diff --git a/plugingui/texturedbox.cc b/plugingui/texturedbox.cc
index c0391c7..a03eecd 100644
--- a/plugingui/texturedbox.cc
+++ b/plugingui/texturedbox.cc
@@ -50,6 +50,8 @@ TexturedBox::TexturedBox(ImageCache& image_cache, const std::string& filename,
, dy1(dy1)
, dy2(dy2)
, dy3(dy3)
+ , _width(dx1 + dx2 + dx3)
+ , _height(dy1 + dy2 + dy3)
{
}
diff --git a/plugingui/texturedbox.h b/plugingui/texturedbox.h
index d393b22..dc84183 100644
--- a/plugingui/texturedbox.h
+++ b/plugingui/texturedbox.h
@@ -101,14 +101,14 @@ private:
Texture seg_h;
Texture seg_i;
- std::size_t _width{100};
- std::size_t _height{100};
std::size_t dx1;
std::size_t dx2;
std::size_t dx3;
std::size_t dy1;
std::size_t dy2;
std::size_t dy3;
+ std::size_t _width{100};
+ std::size_t _height{100};
Colour outOfRange{0.0f, 0.0f, 0.0f, 0.0f};
};