From 0e5f9bb3e8ad387983031049138646e17f865fc7 Mon Sep 17 00:00:00 2001 From: Fabien Bodard Date: Tue, 13 Jan 2015 23:06:09 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: Do not invert Blur and Spread git-svn-id: svn://localhost/gambas/trunk@6837 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- .../Report/FReportBoxShadowChooser.class | 9 ++++---- .../Report/FReportBoxShadowChooser.form | 22 +++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.class b/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.class index 8276d6921..280fa4228 100644 --- a/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.class +++ b/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.class @@ -90,13 +90,14 @@ Private Sub GetValue() As String If Not sVal Then sVal = "0px" sRet &= " " & sVal + sVal = crdBlur.Value + If Not sVal Then sVal = "0px" + sRet &= " " & sVal + sVal = crdSpread.Value If Not sVal Then sVal = "0px" sRet &= " " & sVal - sVal = crdBlur.Value - If Not sVal Then sVal = "0px" - sRet &= " " & sVal sRet &= " " & CReportBrush.ColorToString(btnColor.Value) @@ -114,7 +115,7 @@ End Public Sub Form_Open() Dim a As String[] - Dim aCont As CoordBox[] = [crdX, crdY, crdSpread, crdBlur] + Dim aCont As CoordBox[] = [crdX, crdY, crdBlur, crdSpread] Dim i As Integer 'Value = "1px -2cm 3mm 1px #FF5641" If Not Value Then diff --git a/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.form b/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.form index e9fa701cc..cc427acc6 100644 --- a/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.form +++ b/app/src/gambas3/.src/Dialog/Report/FReportBoxShadowChooser.form @@ -21,10 +21,10 @@ MoveScaled(1,1,28,26) { crdBlur CoordBox crdBrush Name = "crdBlur" - MoveScaled(9,15,18,4) + MoveScaled(9,10,18,4) } { Label4 Label - MoveScaled(0,15,9,4) + MoveScaled(0,10,9,4) #Translate = False Text = "Blur" } @@ -32,10 +32,6 @@ Name = "crdX" MoveScaled(9,0,18,4) } - { crdSpread CoordBox crdBrush - Name = "crdSpread" - MoveScaled(9,10,18,4) - } { Label3 Label MoveScaled(0,0,9,4) #Translate = False @@ -46,11 +42,6 @@ #Translate = False Text = "Y offset" } - { Label6 Label - MoveScaled(0,10,9,4) - #Translate = False - Text = "Spread" - } { crdY CoordBox crdBrush Name = "crdY" MoveScaled(9,5,18,4) @@ -64,6 +55,15 @@ Name = "btnColor" MoveScaled(9,20,18,5) } + { Label6 Label + MoveScaled(0,15,9,4) + #Translate = False + Text = "Spread" + } + { crdSpread CoordBox crdBrush + Name = "crdSpread" + MoveScaled(9,15,18,4) + } } Index = 0 }