gtk2: clean up

git-svn-id: trunk@34876 -
This commit is contained in:
mattias 2012-01-22 20:25:54 +00:00
parent 229d01038d
commit 6f4c4b5d3c

View File

@ -7411,7 +7411,7 @@ begin
Rect1.Y := 0; //Widget^.Allocation.Y; Rect1.Y := 0; //Widget^.Allocation.Y;
Rect1.width := Widget^.Allocation.Width; Rect1.width := Widget^.Allocation.Width;
Rect1.height := Widget^.Allocation.Height; Rect1.height := Widget^.Allocation.Height;
DebugLn(['ScrollWindowEx A ', dbgs(Rect1),' dy=',dy, ' scroll=',dbgs(prcScroll^), ' clip=',dbgs(prcClip^)]); //DebugLn(['ScrollWindowEx A ', dbgs(Rect1),' dy=',dy, ' scroll=',dbgs(prcScroll^), ' clip=',dbgs(prcClip^)]);
if PrcScroll <> nil then if PrcScroll <> nil then
begin begin
@ -7430,11 +7430,11 @@ begin
end end
else else
Rect1a := Rect1; Rect1a := Rect1;
DebugLn(['ScrollWindowEx B ', dbgs(Rect1), ' ', dbgs(Rect1a)]); //DebugLn(['ScrollWindowEx B ', dbgs(Rect1), ' ', dbgs(Rect1a)]);
WidgetInfo := GetWidgetInfo(Widget, False); WidgetInfo := GetWidgetInfo(Widget, False);
if WidgetInfo <> nil then begin if WidgetInfo <> nil then begin
DebugLn(['ScrollWindowEx C ', dbgs(WidgetInfo^.UpdateRect)]); //DebugLn(['ScrollWindowEx C ', dbgs(WidgetInfo^.UpdateRect)]);
// exclude allready invalidated area // exclude allready invalidated area
if (WidgetInfo^.UpdateRect.Right >= Rect1a.x + Rect1a.width) and if (WidgetInfo^.UpdateRect.Right >= Rect1a.x + Rect1a.width) and
(WidgetInfo^.UpdateRect.Left <= Rect1a.x) (WidgetInfo^.UpdateRect.Left <= Rect1a.x)
@ -7461,7 +7461,7 @@ begin
end; end;
end; end;
end; end;
DebugLn(['ScrollWindowEx D ', dbgs(Rect1a)]); //DebugLn(['ScrollWindowEx D ', dbgs(Rect1a)]);
if (Rect1a.height > 0) and (Rect1a.width > 0) then begin if (Rect1a.height > 0) and (Rect1a.width > 0) then begin
@ -7475,7 +7475,7 @@ begin
Rect2 := Rect(Rect1.x, Rect1.y, Rect2 := Rect(Rect1.x, Rect1.y,
Rect1.width, Rect1a.y + dy); Rect1.width, Rect1a.y + dy);
// Todo dx // Todo dx
DebugLn(['ScrollWindowEx E ', dbgs(Rect2)]); //DebugLn(['ScrollWindowEx E ', dbgs(Rect2)]);
Region := gdk_region_rectangle(@Rect1a); Region := gdk_region_rectangle(@Rect1a);
gdk_window_move_region(Window, Region, dx, dy); gdk_window_move_region(Window, Region, dx, dy);
@ -7483,7 +7483,7 @@ begin
else begin else begin
// invalidate, nothing to scroll // invalidate, nothing to scroll
Rect2 := Rect(Rect1.x, Rect1.y, Rect1.x + Rect1.width, Rect1.y + Rect1.height); Rect2 := Rect(Rect1.x, Rect1.y, Rect1.x + Rect1.width, Rect1.y + Rect1.height);
DebugLn(['ScrollWindowEx F ', dbgs(Rect2)]); //DebugLn(['ScrollWindowEx F ', dbgs(Rect2)]);
end; end;
// Rect2 includes the Area at the scroll-in side of Rect1 // Rect2 includes the Area at the scroll-in side of Rect1