Kaydet (Commit) e8681bed authored tarafından Noel Power's avatar Noel Power

Revert "fix ( hopefully ) viewing artifacts in input line fdo#44391"

This reverts commit 1f0ba007.
üst 1f0ba007
......@@ -1125,8 +1125,7 @@ ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh
ScTextWnd( pParen, pViewSh ),
mrGroupBar(* pParen ),
mnLines( 1 ),
mnLastExpandedLines( INPUTWIN_MULTILINES ),
mbInvalidate( false )
mnLastExpandedLines( INPUTWIN_MULTILINES )
{
nTextStartPos = TEXT_MULTI_STARTPOS;
}
......@@ -1139,14 +1138,7 @@ void ScMultiTextWnd::Paint( const Rectangle& rRec )
{
EditView* pView = GetEditView();
if ( pView )
{
if ( mbInvalidate )
{
pView->Invalidate();
mbInvalidate = false;
}
pEditView->Paint( rRec );
}
pView->Paint( rRec );
}
EditView* ScMultiTextWnd::GetEditView()
......@@ -1411,7 +1403,8 @@ void ScMultiTextWnd::SetTextString( const String& rNewString )
// inputbar window scrolled to the bottom if we do that here ( because the tableview and topview
// are synced I guess ).
// should fix that I suppose :-/ need to look a bit further into that
mbInvalidate = true; // ensure next Paint ( that uses editengine ) call will call Invalidate first
if ( pEditView )
pEditView->Invalidate();
ScTextWnd::SetTextString( rNewString );
SetScrollBarRange();
DoScroll();
......
......@@ -204,7 +204,6 @@ private:
ScInputBarGroup& mrGroupBar;
long mnLines;
long mnLastExpandedLines;
bool mbInvalidate;
};
class ScInputBarGroup : public ScTextWndBase
......
......@@ -50,7 +50,7 @@ for $arg (@ARGV) {
$path = Cwd::realpath( $ENV{DESTDIR} . $arg );
if (!$do_link) {
my $destdir = Cwd::realpath( $ENV{DESTDIR} );
# $path =~ s|$destdir||;
$path =~ s|$destdir||;
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment