diff --git a/comp/src/gb.form/.info b/comp/src/gb.form/.info index 2ca4063e8..de5cece2f 100644 --- a/comp/src/gb.form/.info +++ b/comp/src/gb.form/.info @@ -913,7 +913,7 @@ C _Properties C s -*,Mode{Select.None;Single;Multiple}=None,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding,Spacing,ShowShadow +*,Mode{Select.None;Single;Multiple}=None,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding=10,Spacing=10,ShowShadow _Group C s @@ -1002,6 +1002,10 @@ _DocumentItem : (Page)i(Width)i(Height)i +:Finished +: + + :Zoom : diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index c64d28ea5..735516d45 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,7 +1,7 @@ # Gambas Project File 3.0 # Compiled with Gambas 3.6.90 Title=More controls for graphical components -Startup=FTestColorChooser +Startup=FDocumentView Version=3.6.90 VersionFile=1 Component=gb.image diff --git a/comp/src/gb.form/.src/DocumentView/DocumentView.class b/comp/src/gb.form/.src/DocumentView/DocumentView.class index 401a0391a..9786e43bf 100644 --- a/comp/src/gb.form/.src/DocumentView/DocumentView.class +++ b/comp/src/gb.form/.src/DocumentView/DocumentView.class @@ -5,7 +5,7 @@ Export Inherits UserControl -Public Const _Properties As String = "*,Mode{Select.None;Single;Multiple}=None,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding,Spacing,ShowShadow" +Public Const _Properties As String = "*,Mode{Select.None;Single;Multiple}=None,Arrangement{Arrange.Row;Column;Vertical;Horizontal;Fill}=Row,Padding=10,Spacing=10,ShowShadow" Public Const _Group As String = "View" Public Const _Similar As String = "GridView" @@ -65,7 +65,7 @@ Private $fMaxPageHeight As Float ''Hauteur du plus grand doc Private $fMaxPageWidth As Float ''Largeur du plus grand doc Private $iMaxPageHeight As Integer Private $iMaxPageWidth As Integer -Private $iSpace As Integer = 30 ''Taille de l'espacement +Private $iSpace As Integer = 10 ''Taille de l'espacement Private $iNbreLines As Integer ''Nombre de ligne totale Private $tmrLoad As New Timer As "tmrLoad" Private $tmrRefresh As New Timer As "tmrRefresh" @@ -179,7 +179,7 @@ End Private Sub DrawDoc(Page As Integer, iRow As Integer, iCol As Integer) Dim iDocX, iDocY As Integer - Dim fShad As Float = 5 * $fZoom + Dim fShad As Float = $fZoom * ($iSpace / 4) If $colLayout.Exist(Page) Then $fScaledDocWidth = $colLayout[Page].Width * $fZoom