You've already forked lazarus-ccr
* Readd the fixes to the header position that were lost after rev 619
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@621 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
@@ -10595,6 +10595,9 @@ begin
|
|||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
//lclheader
|
||||||
|
RedrawWindow(Handle, @R, 0, RDW_FRAME or RDW_INVALIDATE or RDW_VALIDATE or RDW_NOINTERNALPAINT or
|
||||||
|
RDW_NOERASE or RDW_NOCHILDREN);
|
||||||
|
|
||||||
{
|
{
|
||||||
// Current position of the owner in screen coordinates.
|
// Current position of the owner in screen coordinates.
|
||||||
@@ -29223,7 +29226,8 @@ begin
|
|||||||
if toChildrenAbove in FOptions.FPaintOptions then
|
if toChildrenAbove in FOptions.FPaintOptions then
|
||||||
begin
|
begin
|
||||||
PosHoldable := (FOffsetY + (Integer(Node.TotalHeight - NodeHeight[Node]))) <= 0;
|
PosHoldable := (FOffsetY + (Integer(Node.TotalHeight - NodeHeight[Node]))) <= 0;
|
||||||
NodeInView := Up.Top < ClientHeight;
|
//lclheader
|
||||||
|
NodeInView := Up.Top < inherited GetClientRect.Bottom;
|
||||||
Steps := 0;
|
Steps := 0;
|
||||||
if NodeInView then
|
if NodeInView then
|
||||||
begin
|
begin
|
||||||
@@ -29240,7 +29244,8 @@ begin
|
|||||||
FOffsetY + (Up.Bottom - Integer(Node.TotalHeight)));
|
FOffsetY + (Up.Bottom - Integer(Node.TotalHeight)));
|
||||||
Up.Top := Max(Up.Bottom - Integer(Node.TotalHeight),
|
Up.Top := Max(Up.Bottom - Integer(Node.TotalHeight),
|
||||||
FOffsetY + (Up.Bottom - Integer(Node.TotalHeight)));
|
FOffsetY + (Up.Bottom - Integer(Node.TotalHeight)));
|
||||||
Up.Bottom := ClientHeight;
|
//lclheader
|
||||||
|
Up.Bottom := inherited GetClientRect.Bottom;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
end
|
end
|
||||||
@@ -29248,12 +29253,15 @@ begin
|
|||||||
begin
|
begin
|
||||||
Mode := tamScrollUp;
|
Mode := tamScrollUp;
|
||||||
Inc(Up.Top, NodeHeight[Node]);
|
Inc(Up.Top, NodeHeight[Node]);
|
||||||
Up.Bottom := ClientHeight;
|
//lclheader
|
||||||
|
Up.Bottom := inherited GetClientRect.Bottom;
|
||||||
|
|
||||||
Steps := Min(Up.Bottom - Up.Top + 1, Node.TotalHeight - NodeHeight[Node]);
|
Steps := Min(Up.Bottom - Up.Top + 1, Node.TotalHeight - NodeHeight[Node]);
|
||||||
end;;
|
end;
|
||||||
|
|
||||||
// No animation necessary if the node is below the current client height.
|
// No animation necessary if the node is below the current client height.
|
||||||
if Up.Top < ClientHeight then
|
//lclheader
|
||||||
|
if Up.Top < inherited GetClientRect.Bottom then
|
||||||
begin
|
begin
|
||||||
Window := Handle;
|
Window := Handle;
|
||||||
DC := GetDC(Handle);
|
DC := GetDC(Handle);
|
||||||
@@ -29327,12 +29335,14 @@ begin
|
|||||||
// is to keep the nodes visual position so the user does not get confused. As a result we need to
|
// is to keep the nodes visual position so the user does not get confused. As a result we need to
|
||||||
// scroll the view when the expanding is done. To determine what to do after expanding we need to check
|
// scroll the view when the expanding is done. To determine what to do after expanding we need to check
|
||||||
// the cases below.
|
// the cases below.
|
||||||
TotalFit := NewHeight + Integer(NodeHeight[Node]) <= ClientHeight;
|
//lclheader
|
||||||
PosHoldable := TotalFit and ((FOffsetY - NewHeight) >= -(Integer(FRangeY) - ClientHeight));
|
//todo: add a variable to hold the actual clientheight
|
||||||
|
TotalFit := NewHeight + Integer(NodeHeight[Node]) <= inherited GetClientRect.Bottom;
|
||||||
|
PosHoldable := TotalFit and ((FOffsetY - NewHeight) >= -(Integer(FRangeY) - inherited GetClientRect.Bottom));
|
||||||
ChildrenInView := (Down.Top - NewHeight) >= 0;
|
ChildrenInView := (Down.Top - NewHeight) >= 0;
|
||||||
NodeInView := (PosHoldable or ((Down.Bottom + NewHeight) <= ClientHeight))
|
NodeInView := (PosHoldable or ((Down.Bottom + NewHeight) <= inherited GetClientRect.Bottom))
|
||||||
and (Down.Bottom < ClientHeight - 1);
|
and (Down.Bottom < inherited GetClientRect.Bottom - 1);
|
||||||
Down.Bottom := ClientHeight;
|
Down.Bottom := inherited GetClientRect.Bottom;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user