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

 # Gambas Project File 3.0
 Title=Common controls and classes for GUI components
-Startup=FTestIconView
+Startup=FTestGridView
 Icon=.hidden/window.png
 Version=3.17.90
 VersionFile=1

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

@@ -217,7 +217,7 @@ Private Sub DrawCell(X As Integer, Y As Integer, W As Integer, H As Integer, iRo
   Dim A As Integer
   Dim iColor As Integer
   Dim bCancel As Boolean
-  Dim iPadding As Integer
+  Dim iPaddingH, iPaddingV As Integer
   Dim iBg As Integer
 
   Paint.Save
@@ -266,14 +266,13 @@ Private Sub DrawCell(X As Integer, Y As Integer, W As Integer, H As Integer, iRo
       End With
     Endif
 
-    iPadding = Max($iPadding, .Padding)
+    iPaddingH = Max($iPadding, .Padding) + $hColumns.Padding
+    iPaddingV = Max($iPadding, .Padding) + $hRows.Padding
     
-    If iPadding Then
-      X += iPadding
-      Y += iPadding
-      W -= iPadding * 2
-      H -= iPadding * 2
-    Endif
+    X += iPaddingH
+    Y += iPaddingV
+    W -= iPaddingH * 2
+    H -= iPaddingV * 2
     
     If W <= 0 Or If H <= 0 Then Goto DRAW_GRID
     
@@ -319,8 +318,8 @@ Private Sub DrawCell(X As Integer, Y As Integer, W As Integer, H As Integer, iRo
       
         DrawAlignedPicture(hPict, X, Y, W, H, A)
         
-        W -= hPict.W + iPadding
-        If Not Me.RightToLeft Then X += hPict.W + iPadding
+        W -= hPict.W + iPaddingH
+        If Not Me.RightToLeft Then X += hPict.W + iPaddingH
         
       Endif
       
@@ -2171,7 +2170,7 @@ Public Sub _GetPreferredWidth(iCol As Integer) As Integer
   Dim bBusy As Boolean
   Dim J As Integer
   
-  PW = Me.Font.TextWidth($hColumns[iCol].Text) + Max(Desktop.Scale \ 2, $iPadding) * 2 + If($bSorted, 16, 0) + 2
+  PW = Me.Font.TextWidth($hColumns[iCol].Text) + Max(Desktop.Scale \ 2, $iPadding) * 2 + $hColumns.Padding * 2 + If($bSorted, 16, 0) + 2
   
   fTime = Timer
   
@@ -2301,7 +2300,7 @@ Public Sub _GetPreferredHeight(iRow As Integer) As Integer
     
     With hData
       
-      iPadding = Max($iPadding, .Padding)
+      iPadding = Max($iPadding, .Padding) + $hRows.Padding
       H = iPadding * 2
       hFont = .Font
       If Not hFont Then hFont = Me.Font

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

@@ -9,6 +9,7 @@ Property Resizable As Boolean
 Property Width, W As Integer
 Property Sort As Integer
 Property Ascending As Boolean
+Property Padding As Integer Use $iPadding
 
 Event _Refresh
 
@@ -258,3 +259,10 @@ Private Sub Ascending_Write(Value As Boolean)
   End With
 
 End
+
+Private Sub Padding_Write(Value As Integer)
+  
+  $iPadding = Value
+  _Layout
+  
+End

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

@@ -9,6 +9,7 @@ Property Resizable As Boolean
 Property Height, H As Integer
 Property Selection As Integer[]
 Property Border As Border
+Property Padding As Integer Use $iPadding
 
 Event _Refresh
 
@@ -117,7 +118,7 @@ Public Sub _GetDefaultRowHeight() As Integer
   If $iDefaultHeight > 0 Then Return $iDefaultHeight
   hView = GetView()
 
-  H = hView._GetTextHeight() + hView.Padding * 2 + 2
+  H = hView._GetTextHeight() + hView.Padding * 2 + $iPadding * 2 + 2
   If $hBorder Then
     With $hBorder
       H += .TopPadding + .BottomPadding + .TopWidth + .BottomWidth + .TopMargin + .BottomMargin
@@ -573,3 +574,10 @@ Public Sub _GetRowTextAlign(iRow As Integer) As Integer
   Endif
   
 End
+
+Private Sub Padding_Write(Value As Integer)
+  
+  $iPadding = Value
+  GetView()._ResizeContents()
+  
+End

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

@@ -3,7 +3,7 @@
 Export
 Inherits UserControl
 
-Public Const _Properties As String = "*,List,Border=True,Mode{Select.*}=Single,ScrollBar{Scroll.*}=Vertical,Wrap,Sorted"
+Public Const _Properties As String = "*,List,Border=True,Grid,Mode{Select.*}=Single,ScrollBar{Scroll.*}=Vertical,Wrap,Sorted"
 Public Const _Group As String = "View"
 Public Const _DefaultEvent As String = "Click"
 Public Const _DefaultSize As String = "16,16"
@@ -20,6 +20,7 @@ Property Read Text As String
 Property List As String[]
 Property Font As Font
 Property Wrap As Boolean
+Property Grid As Boolean
 
 Property ScrollX As Integer
 Property ScrollY As Integer
@@ -510,3 +511,16 @@ Public Sub GridView_Arrange()
   If $bWrap Then ResizeLater
   
 End 
+
+Private Function Grid_Read() As Boolean
+
+  Return $hView.Grid
+
+End
+
+Private Sub Grid_Write(Value As Boolean)
+
+  $hView.Grid = Value
+  $hView.Rows.Padding = If(Value, Desktop.Scale, 0)
+
+End

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

@@ -107,6 +107,9 @@ Public Sub Form_Open()
   
   txtPadding.Value = gvwInfo.Padding
   
+  gvwInfo.Rows.Padding = Desktop.Scale \ 2
+  gvwInfo.Columns.Padding = Desktop.Scale
+  
   Me.Height += 2
 
 End