From 74fc7e697cd0c6ce2d5dfb07762993ef1ec86338 Mon Sep 17 00:00:00 2001 From: FellippeHeitor Date: Thu, 10 May 2018 23:08:44 -0300 Subject: [PATCH] Fixes #42: restore Mask field property box and improves behavior. --- InForm/UiEditor.bas | 7 ++++++- InForm/UiEditorPreview.bas | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/InForm/UiEditor.bas b/InForm/UiEditor.bas index c27807a..7655a07 100644 --- a/InForm/UiEditor.bas +++ b/InForm/UiEditor.bas @@ -1113,6 +1113,11 @@ SUB __UI_BeforeUpdateDisplay Text(TextTB) = Replace(PreviewTexts(FirstSelected), CHR$(13), "\n", False, 0) ELSE Text(TextTB) = PreviewTexts(FirstSelected) + IF LEN(PreviewMasks(FirstSelected)) > 0 AND PreviewControls(FirstSelected).Type = __UI_Type_TextBox THEN + Mask(TextTB) = PreviewMasks(FirstSelected) + ELSE + Mask(TextTB) = "" + END IF END IF IF (__UI_Focus = TextTB AND RevertEdit = True) THEN RevertEdit = False: SelectPropertyFully __UI_Focus ELSEIF __UI_Focus = TextTB THEN @@ -1461,7 +1466,7 @@ SUB __UI_BeforeUpdateDisplay Control(PasswordMaskCB).Disabled = False FOR i = 1 TO UBOUND(InputBox) SELECT CASE InputBox(i).ID - CASE ValueTB, MinTB, IntervalTB, PaddingTB, MaskTB, AlignOptions, VAlignOptions, MinIntervalTB + CASE ValueTB, MinTB, IntervalTB, PaddingTB, AlignOptions, VAlignOptions, MinIntervalTB Control(InputBox(i).ID).Disabled = True CASE ELSE Control(InputBox(i).ID).Disabled = False diff --git a/InForm/UiEditorPreview.bas b/InForm/UiEditorPreview.bas index 5e9bdc2..f8d2672 100644 --- a/InForm/UiEditorPreview.bas +++ b/InForm/UiEditorPreview.bas @@ -844,6 +844,7 @@ SUB __UI_BeforeUpdateDisplay FOR i = 1 TO UBOUND(Control) IF Control(i).ControlIsSelected THEN Mask(i) = b$ + Text(i) = "" END IF NEXT CASE 36 'MinInterval