- rethink DrawDefaultDockImage: add 3 dock image operation: show, hide and move

- implement qt DrawDefaultDockImage

git-svn-id: trunk@13608 -

lcl/include/dragmanager.inc

@@ -60,7 +60,7 @@ type
   TDockPerformer = class(TDragDockComon)
   private
     FDockObject: TDragDockObject;
-    procedure DefaultDockImage(ADrawRect: TRect; Erase: Boolean);
+    procedure DefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation);
   protected
     function Dragging(AControl: TControl): boolean; override;
     procedure DragStarted(APosition: TPoint); override;
@@ -304,7 +304,7 @@ begin
   FDragImageList := FDockObject.GetDragImages;
   if FDragImageList <> nil then
     FDragImageList.BeginDrag(0, APosition.X, APosition.Y);
-  DefaultDockImage(FDockObject.DockRect, False);
+  DefaultDockImage(FDockObject.EraseDockRect, FDockObject.DockRect, disShow);
   FDockObject.EraseDockRect := FDockObject.DockRect;
 end;
 
@@ -467,9 +467,7 @@ begin
     //Draw the form outlines when the position has changed
     if not CompareMem(@DockRect, @EraseDockRect, SizeOf(TRect)) then
     begin
-      if EraseDockRect.Left <> Maxint then
+      DefaultDockImage(FDockObject.EraseDockRect, FDockObject.DockRect, disMove);
-        DefaultDockImage(FDockObject.EraseDockRect, True);
-      DefaultDockImage(FDockObject.DockRect, False);
       EraseDockRect := DockRect;
     end;
   end;
@@ -489,7 +487,7 @@ begin
     FDockObject := nil;
     SetCaptureControl(nil);
 
-    DefaultDockImage(ADockObjectCopy.EraseDockRect, True);
+    DefaultDockImage(ADockObjectCopy.EraseDockRect, ADockObjectCopy.DockRect, disHide);
     ADockObjectCopy.Floating := ADockObjectCopy.DragTarget = nil;
 
     Accepted := ADockObjectCopy.DragTarget <> nil;
@@ -545,9 +543,9 @@ begin
 end;
 
 
-procedure TDockPerformer.DefaultDockImage(ADrawRect: TRect; Erase: Boolean);
+procedure TDockPerformer.DefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation);
 begin
-  WidgetSet.DrawDefaultDockImage(ADrawRect, Erase);
+  WidgetSet.DrawDefaultDockImage(AOldRect, ANewRect, AOperation);
 end;
 
 { TDragManagerDefault }

lcl/include/intfbaselcl.inc

@@ -140,36 +140,45 @@ procedure TWidgetSet.DrawArrow(Arrow: TComponent; Canvas: TPersistent);
 begin
 end;
 
-procedure TWidgetSet.DrawDefaultDockImage(ARect: TRect; Erase: Boolean);
+procedure TWidgetSet.DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation);
-const
+
-  PenSize=4;
+  procedure DefaultDockImage(ARect: TRect);
-var
+  const
-  DC: HDC;
+    PenSize=4;
-  OldPen, NewPen: HPen;
+  var
-  OldRop: Integer;
+    DC: HDC;
-  LogPen: TLogPen;
+    OldPen, NewPen: HPen;
-begin
+    OldRop: Integer;
-  LogPen.lopnColor := $00FFFFFF;
+    LogPen: TLogPen;
-  LogPen.lopnWidth := Point(PenSize, 0);
+  begin
-  LogPen.lopnStyle := PS_SOLID;
+    LogPen.lopnColor := $00FFFFFF;
-  DC := GetDC(0);
+    LogPen.lopnWidth := Point(PenSize, 0);
-  try
+    LogPen.lopnStyle := PS_SOLID;
-    NewPen := CreatePenIndirect(LogPen);
+    DC := GetDC(0);
-    OldPen := SelectObject(DC, NewPen);
+    try
-    OldRop := SetROP2(DC, R2_XORPEN);
+      NewPen := CreatePenIndirect(LogPen);
-    with ARect do
+      OldPen := SelectObject(DC, NewPen);
-    begin
+      OldRop := SetROP2(DC, R2_XORPEN);
-      MoveToEx(DC, Left+PenSize, Top+PenSize, nil);
+      with ARect do
-      LineTo(DC, Right-PenSize,Top+PenSize);
+      begin
-      LineTo(DC, Right-PenSize, Bottom-PenSize);
+        MoveToEx(DC, Left+PenSize, Top+PenSize, nil);
-      LineTo(DC, Left+PenSize,Bottom-PenSize);
+        LineTo(DC, Right-PenSize,Top+PenSize);
-      LineTo(DC, Left+PenSize, Top+PenSize);
+        LineTo(DC, Right-PenSize, Bottom-PenSize);
+        LineTo(DC, Left+PenSize,Bottom-PenSize);
+        LineTo(DC, Left+PenSize, Top+PenSize);
+      end;
+    finally
+      SetROP2(DC, OldRop);
+      DeleteObject(SelectObject(DC, OldPen));
+      ReleaseDC(0, DC);
     end;
-  finally
-    SetROP2(DC, OldRop);
-    DeleteObject(SelectObject(DC, OldPen));
-    ReleaseDC(0, DC);
   end;
+  
+begin
+  if AOperation in [disMove, disHide] then
+    DefaultDockImage(AOldRect);
+  if AOperation in [disMove, disShow] then
+    DefaultDockImage(ANewRect);
 end;
 
 function TWidgetSet.ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint;

lcl/include/lclintf.inc

@@ -149,9 +149,9 @@ begin
   WidgetSet.DrawArrow(Arrow, Canvas);
 end;
 
-procedure DrawDefaultDockImage(ARect: TRect; Erase: Boolean);
+procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation);
 begin
-  WidgetSet.DrawDefaultDockImage(ARect, Erase);
+  WidgetSet.DrawDefaultDockImage(AOldRect, ANewRect, AOperation);
 end;
 
 function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect;

lcl/include/lclintfh.inc

@@ -66,7 +66,7 @@ function CreateStandardCursor(ACursor: SmallInt): hCursor; {$IFDEF IF_BASE_MEMBE
 function DCClipRegionValid(DC: HDC): boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 procedure DeallocateHWnd(Wnd: HWND); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 procedure DrawArrow(Arrow: TComponent; Canvas: TPersistent); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
-procedure DrawDefaultDockImage(ARect: TRect; Erase: Boolean); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
+procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 
 function ExtUTF8Out(DC: HDC; X, Y: Integer; Options: Longint; Rect: PRect; Str: PChar; Count: Longint; Dx: PInteger): Boolean;  {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
 

lcl/interfaces/qt/qtint.pp

@@ -60,6 +60,7 @@ type
     App: QApplicationH;
     SavedDCList: TList;
     FOldFocusWidget: QWidgetH;
+    FDockImage: QRubberBandH;
   protected
     FStockNullBrush: HBRUSH;
     FStockBlackBrush: HBRUSH;

lcl/interfaces/qt/qtlclintf.inc

@@ -114,6 +114,18 @@ begin
   end;
 end;
 
+procedure TQtWidgetSet.DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation);
+begin
+  if FDockImage = nil then
+    FDockImage := QRubberBand_create(QRubberBandRectangle);
+
+  QRubberBand_setGeometry(FDockImage, @ANewRect);
+  case AOperation of
+    disShow: QWidget_show(FDockImage);
+    disHide: QWidget_hide(FDockImage);
+  end;
+end;
+
 
 {------------------------------------------------------------------------------
   Function: FontCanUTF8
@@ -129,7 +141,7 @@ begin
     Result := False;
   {$endif}
   {$else}
-	  Result := IsValidGDIObject(Font);
+    Result := IsValidGDIObject(Font);
   {$endif}
 end;
 

lcl/interfaces/qt/qtlclintfh.inc

@@ -32,6 +32,7 @@
 
 function CreateStandardCursor(ACursor: SmallInt): hCursor; override;
 procedure DrawArrow(Arrow: TComponent; Canvas: TPersistent); override;
+procedure DrawDefaultDockImage(AOldRect, ANewRect: TRect; AOperation: TDockImageOperation); override;
 
 function FontCanUTF8(Font: HFont): boolean; override;
 function FontIsMonoSpace(Font: HFont): boolean; override;

lcl/interfaces/qt/qtobject.inc

@@ -29,6 +29,7 @@ begin
   InitStockItems;
  
   QtWidgetSet := Self;
+  FDockImage := nil;
 end;
 
 {------------------------------------------------------------------------------
@@ -40,6 +41,8 @@ end;
  ------------------------------------------------------------------------------}
 destructor TQtWidgetSet.Destroy;
 begin
+  if FDockImage <> nil then
+    QRubberBand_destroy(FDockImage);
   DestroyGlobalCaret;
   Clipboard.Free;
   FreeStockItems;

lcl/lcltype.pp

@@ -67,6 +67,8 @@ type
   TCriticalSection = PtrUInt;
   PCriticalSection = ^TCriticalSection;
 
+  TDockImageOperation = (disShow, disMove, disHide);
+  
 {$ifndef WINDOWS}
   {$IFDEF CPU64}
   // temp solution for 32bit system.Thandle