fix more x errors due to using an invalid background

3 files changed, 11 insertions, 3 deletions

diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index b996edc..090b788 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -153,6 +153,11 @@ void FbWindow::setBackgroundPixmap(Pixmap bg_pixmap) {
     updateBackground(false);
 }
 
+void FbWindow::invalidateBackground() {
+    m_lastbg_pm = None;
+    m_lastbg_color_set = false;
+}
+
 void FbWindow::updateBackground(bool only_if_alpha) {
     Pixmap newbg = m_lastbg_pm;
     unsigned char alpha = 255;
diff --git a/src/FbTk/FbWindow.hh b/src/FbTk/FbWindow.hh
index 8f7376c..1f0c4bd 100644
--- a/src/FbTk/FbWindow.hh
+++ b/src/FbTk/FbWindow.hh
@@ -74,6 +74,8 @@ public:
     virtual ~FbWindow();
     virtual void setBackgroundColor(const FbTk::Color &bg_color);
     virtual void setBackgroundPixmap(Pixmap bg_pixmap);
+    // call when background is freed, and new one not ready yet
+    virtual void invalidateBackground();
     virtual void setBorderColor(const FbTk::Color &border_color);
     virtual void setBorderWidth(unsigned int size);
     /// set window name ("title")
diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc
index 0d9eef0..474c094 100644
--- a/src/FbTk/TextButton.cc
+++ b/src/FbTk/TextButton.cc
@@ -63,8 +63,10 @@ void TextButton::setJustify(FbTk::Justify just) {
 }
 
 bool TextButton::setOrientation(FbTk::Orientation orient) {
-    if (!m_font->validOrientation(orient))
+    if (orient == m_orientation
+        || !m_font->validOrientation(orient))
         return false;
+    invalidateBackground();
 
     if ((m_orientation == FbTk::ROT0 || m_orientation == FbTk::ROT180) &&
         (orient == FbTk::ROT90 || orient == FbTk::ROT270) ||
@@ -76,8 +78,7 @@ bool TextButton::setOrientation(FbTk::Orientation orient) {
     } else {
         m_orientation = orient;
     }
-    updateBackground(false);
-    clear();
+
     return true;
 }