[GB.GUI.BASE]

* BUG: Correctly draw GridView headers, especially when right alignment is 
  used.


git-svn-id: svn://localhost/gambas/trunk@6434 867c0c6c-44f3-4631-809d-bfa615b0a4ec

app/src/gambas3/.project

@@ -2,6 +2,7 @@
 # Compiled with Gambas 3.5.90
 Title=Gambas 3
 Startup=Project
+Profiling=1
 Icon=img/logo/logo-ide.png
 Version=3.5.90
 VersionFile=1

comp/src/gb.gui.base/.project

@@ -1,7 +1,7 @@
 # Gambas Project File 3.0
 # Compiled with Gambas 3.5.90
 Title=gb.gui.base
-Startup=FListBox
+Startup=FGridView
 Version=3.5.90
 VersionFile=1
 Component=gb.image

comp/src/gb.gui.base/.src/GridView/GridView.class

@@ -434,13 +434,13 @@ Public Sub ScrollArea_Draw()
             If WA < .Width Then Style.PaintArrow(X + .Width - WA - $iPadding, F, WA, H - F, If(bAscent, Align.Bottom, Align.Top))
             'Draw.ClipRect = hClip.Intersection(Rect(X, F, Max(0, .Width - WA - 2), H - F))
             'If Draw.ClipRect Then Draw.Text(.Text, X + 4, F, .Width - WA - 8, H - F, .Alignment)
-            Paint.Rectangle(X + 1, F, Max(0, .Width - WA - 4), H - F)
+            Paint.Rectangle(X, F, Max(0, .Width - WA - 2), H - F)
             Paint.Clip
-            DrawText(.Text, X + 4, F, .Width - WA + $iPadding, H - F, .Alignment, $iPadding)
+            DrawText(.Text, X + 1, F, .Width - WA - $iPadding - 2, H - F - 2, .Alignment, Max(1, $iPadding))
           Else
             Paint.Rectangle(X + 1, F, .Width - 2, H - F)
             Paint.Clip
-            DrawText(.Text, X + 4, F, .Width - 8, H - F, .Alignment, $iPadding)
+            DrawText(.Text, X + 1, F, .Width - 2, H - F - 2, .Alignment, Max(1, $iPadding))
           Endif
 
           Paint.Restore

comp/src/gb.gui.base/.src/GridView/_GridView_Columns.class

@@ -67,7 +67,7 @@ Private Function Height_Read() As Integer
 
   With GetView()
     If $aColumns.Count Then
-      If .Header = .Horizontal Or If .Header = .Both Then Return $iHeight + 8
+      If .Header = .Horizontal Or If .Header = .Both Then Return $iHeight + 2
     Endif
   End With
 

comp/src/gb.gui.base/.src/Test/FGridView.class

@@ -12,8 +12,8 @@ Public Sub Form_Open()
   gvwinfo.Columns.Count = 3
   gvwinfo.Rows.Count = 10
   'gvwinfo.Rows.Resizable = True
-  gvwinfo[0, 0].Text = "Name"
-  gvwinfo[0, 1].Text = "compsrch"
+  gvwinfo[0, 0].Text = "Bleu"
+  gvwinfo[0, 1].Text = "Blanc"
   gvwinfo[1, 0].Text = "Version"
   gvwinfo[1, 1].Text = "0.0.7"
   gvwinfo[2, 0].Text = "Type"
@@ -39,6 +39,7 @@ Public Sub Form_Open()
   For I = 0 To 9
     gvwInfo[I, 2].Text = CStr(Int(Rnd(0, 1000)))
   Next
+  gvwinfo[0, 2].Text = "Rouge"
   
   For I = 0 To 2
     gvwInfo.Columns[I].Text = ["Bleu", "Blanc", "Rouge"][I]
@@ -46,6 +47,8 @@ Public Sub Form_Open()
   
   gvwInfo[1, 1].Background = Color.Yellow
   
+  gvwInfo.Columns[1].Alignment = Align.Right
+  
   ScrollArea(gvwInfo.Proxy).Shadow = True
   
   'gvwInfo[0, 0].ColumnSpan = gvwInfo.Columns.Count

comp/src/gb.gui.base/.startup

@@ -1,4 +1,4 @@
-FListBox
+FGridView
 gb.gui.base
 0
 0