Skip to content

Commit 21676f4

Browse files
committed
ACI0103861 fixed v20
1 parent 1f73cae commit 21676f4

File tree

2 files changed

+26
-17
lines changed

2 files changed

+26
-17
lines changed

Project/Sources/Forms/WP_Palette_Fonts/method.4dm

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,16 @@ C_BOOLEAN:C305($setupOK)
33
C_LONGINT:C283($typeSelection)
44

55
$paletteID:=1
6-
$typeSelection:=Form:C1466.selection.type
6+
7+
// ACI0103861
8+
Case of
9+
: (Form:C1466.selection=Null:C1517)
10+
: (Value type:C1509(Form:C1466.selection.type)#Is real:K8:4)
11+
Else
12+
$typeSelection:=Form:C1466.selection.type
13+
End case
14+
15+
716

817
Case of
918
: (Form event code:C388=On Load:K2:1)

Project/Sources/Methods/UI_isProtected.4dm

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//%attributes = {"invisible":true}
2-
// This method returns TRUE if the area is NOT enterable
3-
C_BOOLEAN:C305($1;$manageFocus)
2+
// This method returns TRUE if the area is NOT enterable
3+
C_BOOLEAN:C305($1; $manageFocus)
44
C_BOOLEAN:C305($0)
55
C_BOOLEAN:C305($protected)
6-
C_LONGINT:C283($protectedDoc;$protectedSel)
6+
C_LONGINT:C283($protectedDoc; $protectedSel)
77

88
$protected:=False:C215 // NOT protected by default
99

@@ -23,26 +23,26 @@ If (Not:C34($protected)) // still not protected ?
2323
$protected:=Not:C34(Form:C1466.enterable)
2424
End if
2525

26-
If (Not:C34($protected)) // still not protected ?
26+
If (Not:C34($protected)) && (Form:C1466.selection#Null:C1517) // still not protected ? // ACI0103861
2727

28-
WP GET ATTRIBUTES:C1345(Form:C1466.selection.owner;wk protection enabled:K81:307;$protectedDoc) // 1 protection enabled, 0 protection disabled
29-
WP GET ATTRIBUTES:C1345(Form:C1466.selection;wk protected:K81:306;$protectedSel) // 1 protected, 0 not protected, wk mixed= semi protected
28+
WP Get attributes:C1345(Form:C1466.selection.owner; wk protection enabled:K81:307; $protectedDoc) // 1 protection enabled, 0 protection disabled
29+
WP Get attributes:C1345(Form:C1466.selection; wk protected:K81:306; $protectedSel) // 1 protected, 0 not protected, wk mixed= semi protected
3030
$protected:=(($protectedDoc#0) & ($protectedSel#0))
3131

32-
//If (Not($protected)) // still not protected ?
32+
//If (Not($protected)) // still not protected ?
3333

34-
//$actionInfo:=Get action info(wk border style) // works for text as for pictures !
34+
//$actionInfo:=Get action info(wk border style) // works for text as for pictures !
3535

36-
//If (OB Is defined($actionInfo;"enabled")) //action is defined in the process
37-
//$protected:=Not($actionInfo.enabled)
38-
//End if
36+
//If (OB Is defined($actionInfo;"enabled")) //action is defined in the process
37+
//$protected:=Not($actionInfo.enabled)
38+
//End if
3939

40-
// //If (Not($protected)) // still not protected ?
41-
// //If (Not($protected)) // still not protected ?
42-
// //End if
43-
// //End if
40+
// //If (Not($protected)) // still not protected ?
41+
// //If (Not($protected)) // still not protected ?
42+
// //End if
43+
// //End if
4444

45-
//End if
45+
//End if
4646
End if
4747
End if
4848

0 commit comments

Comments
 (0)