Backport SVN commit #951879

This fixes kde.org bug #189050


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1239902 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

knotes/knote.cpp

@@ -1050,16 +1050,19 @@ void KNote::updateFocus()
             if ( m_tool && m_tool->isHidden() && m_editor->textFormat() == TQTextEdit::RichText )
             {
                 m_tool->show();
-		m_editor->cornerWidget()->show();
                 setGeometry( x(), y(), width(), height() + m_tool->height() );
             }
+            m_editor->cornerWidget()->show();
         }
-        else if ( m_tool && !m_tool->isHidden() )
+        else
         {
-            m_tool->hide();
-	    m_editor->cornerWidget()->hide();
-            setGeometry( x(), y(), width(), height() - m_tool->height() );
-            updateLayout();     // to update the minimum height
+            if ( m_tool && !m_tool->isHidden() )
+            {
+                m_tool->hide();
+                setGeometry( x(), y(), width(), height() - m_tool->height() );
+                updateLayout();     // to update the minimum height
+            }
+            m_editor->cornerWidget()->hide();
         }
 
         m_fold->hide();