Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 2 insertions, 0 deletions

diff --git a/src/IconButton.cc b/src/IconButton.cc
index d63f6da..5e42e9f 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -100,6 +100,7 @@ void IconButton::moveResize(int x, int y,
 
     if (m_icon_window.width() != FbTk::Button::width() ||
         m_icon_window.height() != FbTk::Button::height()) {
+        reconfigTheme();
         update(0); // update icon window
     }
 }
@@ -108,6 +109,7 @@ void IconButton::resize(unsigned int width, unsigned int height) {
     FbTk::TextButton::resize(width, height);
     if (m_icon_window.width() != FbTk::Button::width() ||
         m_icon_window.height() != FbTk::Button::height()) {
+        reconfigTheme();
         update(0); // update icon window
     }
 }