From 2b45910f9ae0e36c367ca0fb9d3db09cb6855549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Tue, 25 Sep 2012 14:10:55 +0000 Subject: [PATCH] [GB.FORM] * NEW: ScrollArea.Shadow is now a dynamic property. This will be backported to 3.3 as soon as possible because this is a forbidden background compatibility break! git-svn-id: svn://localhost/gambas/trunk@5200 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.lang/.pot | 24 +++++++++---------- .../gambas3/.src/Editor/Form/FProperty.class | 2 ++ app/src/gambas3/.src/Project.module | 2 +- comp/src/gb.form/.info | 8 +++---- comp/src/gb.form/.src/ScrollArea.class | 9 ++++--- 5 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/src/gambas3/.lang/.pot b/app/src/gambas3/.lang/.pot index f314044ce..f3123b003 100644 --- a/app/src/gambas3/.lang/.pot +++ b/app/src/gambas3/.lang/.pot @@ -3236,7 +3236,7 @@ msgstr "" msgid "Procedure separation" msgstr "" -#: FOption.form:552 FProperty.class:745 +#: FOption.form:552 FProperty.class:747 msgid "None" msgstr "" @@ -3580,50 +3580,50 @@ msgstr "" msgid "Lock property" msgstr "" -#: FProperty.class:351 +#: FProperty.class:353 msgid "Forbidden characters in control name." msgstr "" -#: FProperty.class:356 +#: FProperty.class:358 msgid "This name is already in use." msgstr "" -#: FProperty.class:366 +#: FProperty.class:368 msgid "Forbidden characters in control group." msgstr "" -#: FProperty.class:426 +#: FProperty.class:428 msgid "Incorrect property value." msgstr "" -#: FProperty.class:577 +#: FProperty.class:579 msgid "The name of the control." msgstr "" -#: FProperty.class:588 +#: FProperty.class:590 msgid "The event group that the control belongs to." msgstr "" -#: FProperty.class:602 +#: FProperty.class:604 msgid "" "If the form and controls dimensions must follow the size of the default font." msgstr "" -#: FProperty.class:606 +#: FProperty.class:608 msgid "If the control is public." msgstr "" -#: FProperty.class:610 +#: FProperty.class:612 msgid "If the Text property must be translated." msgstr "" -#: FProperty.class:631 +#: FProperty.class:633 msgid "" "This property is virtual: it is only implemented in the IDE, and has no " "existence at runtime." msgstr "" -#: FProperty.class:942 +#: FProperty.class:944 msgid "Select a file" msgstr "" diff --git a/app/src/gambas3/.src/Editor/Form/FProperty.class b/app/src/gambas3/.src/Editor/Form/FProperty.class index 7dcc3a67b..77a5c2611 100644 --- a/app/src/gambas3/.src/Editor/Form/FProperty.class +++ b/app/src/gambas3/.src/Editor/Form/FProperty.class @@ -38,6 +38,8 @@ Public Sub _new() grdProperty.ScrollBar = Scroll.Vertical grdProperty.Columns.Resizable = True + ScrollArea(grdProperty.Proxy).Shadow = True + End Public Sub Form_Open() diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module index 4981a4816..e59ae2fb6 100644 --- a/app/src/gambas3/.src/Project.module +++ b/app/src/gambas3/.src/Project.module @@ -255,7 +255,7 @@ Public Sub Main() Next Application.Theme = Settings["/Theme"] - ScrollArea.Shadow = True + 'ScrollArea.Shadow = True OUTPUT_FILE = Temp$() EXAMPLES_DIR = System.Path &/ "share/gambas" & Split(System.Version, ".")[0] & "/examples" diff --git a/comp/src/gb.form/.info b/comp/src/gb.form/.info index afb2b5df1..a9aec10cc 100644 --- a/comp/src/gb.form/.info +++ b/comp/src/gb.form/.info @@ -2109,10 +2109,6 @@ _Similar C s DrawingArea,ScrollView -Shadow -P -b - ScrollX p i @@ -2169,6 +2165,10 @@ Tablet p b +Shadow +p +b + View r DrawingArea diff --git a/comp/src/gb.form/.src/ScrollArea.class b/comp/src/gb.form/.src/ScrollArea.class index 790d279de..bf1797ada 100644 --- a/comp/src/gb.form/.src/ScrollArea.class +++ b/comp/src/gb.form/.src/ScrollArea.class @@ -9,8 +9,6 @@ Public Const _DefaultSize As String = "24,24" Public Const _Similar As String = "DrawingArea,ScrollView" 'Public Const _Group As String = "View" -Static Property Shadow As Boolean - Property ScrollX As Integer Property ScrollY As Integer Property Read ScrollWidth, ScrollW As Integer @@ -29,6 +27,7 @@ Property ScrollBar As Integer Property Tracking As Boolean Property Background As Integer Property Tablet As Boolean +Property Shadow As Boolean Property Read View As DrawingArea Event Scroll @@ -52,7 +51,7 @@ Private $bPainted As Boolean Private $W As Integer Private $H As Integer -Static Private $bShadow As Boolean +Private $bShadow As Boolean Private $iShadowN As Integer Private $iShadowS As Integer Private $iShadowW As Integer @@ -554,13 +553,13 @@ Private Sub Tablet_Write(Value As Boolean) End -Static Private Function Shadow_Read() As Boolean +Private Function Shadow_Read() As Boolean Return $bShadow End -Static Private Sub Shadow_Write(Value As Boolean) +Private Sub Shadow_Write(Value As Boolean) $bShadow = Value