Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxCaretSuspender only shows the caret if it was visible previously

Browse Source 
Improved caret handling in wxTextCtrl
Restored scrollbar painting in wxUniv


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-08-11 16:33:56 +00:00
parent f07c570112
commit e28c2d151b
4 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/univ/textctrl.cpp
View File

@@ -735,6 +735,9 @@ bool wxTextCtrl::Create(wxWindow *parent,
CreateInputHandler(wxINP_HANDLER_TEXTCTRL);
wxSizeEvent sizeEvent(GetSize(), GetId());
GetEventHandler()->ProcessEvent(sizeEvent);
return TRUE;
}
@@ -1864,7 +1867,9 @@ wxPoint wxTextCtrl::GetCaretPosition() const
// pos may be -1 to show the current position
void wxTextCtrl::ShowPosition(wxTextPos pos)
{
HideCaret();
bool showCaret = GetCaret() && GetCaret()->IsVisible();
if (showCaret)
HideCaret();
if ( IsSingleLine() )
{
@@ -1984,7 +1989,8 @@ void wxTextCtrl::ShowPosition(wxTextPos pos)
}
//else: multiline but no scrollbars, hence nothing to do
ShowCaret();
if (showCaret)
ShowCaret();
}
// ----------------------------------------------------------------------------
@@ -4179,7 +4185,7 @@ void wxTextCtrl::DoDraw(wxControlRenderer *renderer)
// show caret first time only: we must show it after drawing the text or
// the display can be corrupted when it's hidden
if ( !m_hasCaret && GetCaret() )
if ( !m_hasCaret && GetCaret() && (FindFocus() == this) )
{
ShowCaret();
@@ -4222,7 +4228,10 @@ bool wxTextCtrl::Enable(bool enable)
if ( !wxTextCtrlBase::Enable(enable) )
return FALSE;
ShowCaret(enable);
if (FindFocus() == this && GetCaret() &&
((enable && !GetCaret()->IsVisible()) ||
(!enable && GetCaret()->IsVisible())))
ShowCaret(enable);
return TRUE;
}
@@ -4258,7 +4267,9 @@ void wxTextCtrl::ShowCaret(bool show)
caret->Move(GetCaretPosition());
// and show it there
caret->Show(show);
if ((show && !caret->IsVisible()) ||
(!show && caret->IsVisible()))
caret->Show(show);
}
}
@@ -4902,13 +4913,24 @@ bool wxStdTextCtrlInputHandler::HandleMouseMove(wxInputConsumer *consumer,
bool
wxStdTextCtrlInputHandler::HandleFocus(wxInputConsumer *consumer,
const wxFocusEvent& WXUNUSED(event))
const wxFocusEvent& event)
{
wxTextCtrl *text = wxStaticCast(consumer->GetInputWindow(), wxTextCtrl);
// the selection appearance changes depending on whether we have the focus
text->RefreshSelection();
if (event.GetEventType() == wxEVT_SET_FOCUS)
{
if (text->GetCaret() && !text->GetCaret()->IsVisible())
text->ShowCaret();
}
else
{
if (text->GetCaret() && text->GetCaret()->IsVisible())
text->HideCaret();
}
// never refresh entirely
return FALSE;
}