1
1
Fork 0
mirror of https://github.com/FellippeHeitor/InForm.git synced 2025-01-15 11:59:34 +00:00

Minor fixes and variable renaming.

This commit is contained in:
FellippeHeitor 2017-07-30 15:10:45 -03:00
parent 13c01c3045
commit 96583790a8
3 changed files with 9 additions and 7 deletions

View file

@ -107,6 +107,7 @@ TYPE __UI_ControlTYPE
CanHaveFocus AS _BYTE
Disabled AS _BYTE
Hidden AS _BYTE
PreviouslyHidden AS _BYTE
CenteredWindow AS _BYTE
ControlState AS _BYTE
ChildrenRedrawn AS _BYTE
@ -170,7 +171,7 @@ DIM SHARED __UI_SelectedText AS STRING, __UI_SelectionLength AS LONG
DIM SHARED __UI_StateHasChanged AS _BYTE
DIM SHARED __UI_DraggingThumb AS _BYTE, __UI_ThumbDragTop AS INTEGER
DIM SHARED __UI_DraggingThumbOnID AS LONG
DIM SHARED __UI_HasInput AS _BYTE, __UI_LastInputReceived AS DOUBLE
DIM SHARED __UI_HasInput AS _BYTE, __UI_ProcessInputTimer AS DOUBLE
DIM SHARED __UI_UnloadSignal AS _BYTE, __UI_HasResized AS _BYTE
DIM SHARED __UI_ExitTriggered AS _BYTE
DIM SHARED __UI_Loaded AS _BYTE
@ -701,7 +702,7 @@ SUB __UI_ProcessInput
__UI_HasInput = True
END IF
__UI_LastInputReceived = TIMER
__UI_ProcessInputTimer = TIMER
END SUB
'---------------------------------------------------------------------------------
@ -1214,7 +1215,7 @@ SUB __UI_UpdateDisplay
STATIC WaitMessageSetup AS _BYTE, PrevWaitMessage AS STRING
DIM NoInputMessage$
IF TIMER - __UI_LastInputReceived > 2 THEN
IF TIMER - __UI_ProcessInputTimer > 2 THEN
'Visually indicate that something is hogging the input routine
IF __UI_WaitMessageHandle = 0 THEN
__UI_WaitMessageHandle = _NEWIMAGE(_WIDTH(0), _HEIGHT(0), 32)

View file

@ -5436,7 +5436,7 @@ SUB CheckPreview
CLOSE #UiEditorFile
UiPreviewPID = 0
SHELL _DONTWAIT ".\InForm\UiEditorPreview.exe"
__UI_LastInputReceived = 0 'Make the "Please wait" message show up immediataly
__UI_ProcessInputTimer = 0 'Make the "Please wait" message show up immediataly
DO
_LIMIT 10
OPEN "InForm/UiEditor.dat" FOR BINARY AS #UiEditorFile
@ -5462,7 +5462,7 @@ SUB CheckPreview
CLOSE #UiEditorFile
UiPreviewPID = 0
SHELL _DONTWAIT "./InForm/UiEditorPreview"
__UI_LastInputReceived = 0 'Make the "Please wait" message show up immediataly
__UI_ProcessInputTimer = 0 'Make the "Please wait" message show up immediataly
DO
_LIMIT 10
OPEN "InForm/UiEditor.dat" FOR BINARY AS #UiEditorFile

View file

@ -1275,10 +1275,11 @@ SUB __UI_DrawFrame (This AS __UI_ControlTYPE)
__UI_ClearColor ControlImage, 0, 0
END IF
IF This.ChildrenRedrawn OR Caption(This.ID) <> __UI_TempCaptions(This.ID) OR This.HelperCanvas = 0 OR (__UI_IsDragging AND Control(__UI_DraggingID).ParentID = This.ID) OR This.Value <> This.PreviousValue OR __UI_ForceRedraw OR __UI_DesignMode THEN
IF This.PreviouslyHidden <> This.Hidden OR This.ChildrenRedrawn OR Caption(This.ID) <> __UI_TempCaptions(This.ID) OR This.HelperCanvas = 0 OR (__UI_IsDragging AND Control(__UI_DraggingID).ParentID = This.ID) OR This.Value <> This.PreviousValue OR __UI_ForceRedraw OR __UI_DesignMode THEN
'Last time we drew this frame its children had different images
This.ChildrenRedrawn = False
This.PreviousValue = This.Value
This.PreviouslyHidden = This.Hidden
__UI_TempCaptions(This.ID) = Caption(This.ID)
_FONT This.Font
@ -1358,7 +1359,7 @@ SUB __UI_DrawFrame (This AS __UI_ControlTYPE)
END IF
_FONT This.Font
IF This.HelperCanvas THEN _PUTIMAGE (This.Left, This.Top - uspacing& \ 2), This.HelperCanvas
IF This.HelperCanvas < -1 THEN _PUTIMAGE (This.Left, This.Top - uspacing& \ 2), This.HelperCanvas
END SUB
'---------------------------------------------------------------------------------