summaryrefslogtreecommitdiffstats
path: root/knotes/knote.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-05 18:17:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-05 18:17:41 +0000
commit09e3107854a6c8601b556a1bf0cc61d5df801f6a (patch)
tree72822eb8d61ed9212e2a66c5956fc0b636d1cdb5 /knotes/knote.cpp
parent02baac4a6ca987888a16e10fd2a5c83c997b543e (diff)
downloadtdepim-09e3107854a6c8601b556a1bf0cc61d5df801f6a.tar.gz
tdepim-09e3107854a6c8601b556a1bf0cc61d5df801f6a.zip
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
Diffstat (limited to 'knotes/knote.cpp')
-rw-r--r--knotes/knote.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index 4281f713d..17d482e37 100644
--- a/knotes/knote.cpp
+++ b/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();