mirror of
https://github.com/FellippeHeitor/InForm.git
synced 2025-01-15 03:49:56 +00:00
Merge pull request #1 from a740g/development
Merge dev branch with master
This commit is contained in:
commit
6309128821
4 changed files with 5990 additions and 5978 deletions
|
@ -7917,26 +7917,30 @@ SUB __UI_DrawListBox (This AS __UI_ControlTYPE, ControlState)
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
IF LEN(Text(This.ID)) THEN
|
IF LEN(Text(This.ID)) THEN
|
||||||
DIM TempText$, FindLF&, ThisItem%, ThisItemTop%
|
DIM TempText$, Position&, FindLF&, ThisItem%, ThisItemTop%
|
||||||
DIM ItemHeight AS INTEGER, LastVisibleItem AS INTEGER
|
DIM ItemHeight AS INTEGER, LastVisibleItem AS INTEGER
|
||||||
|
|
||||||
ItemHeight = uspacing + (((_FONT = 8) * -1) * __UI_Font8Offset + ((_FONT = 16) * -1) * __UI_Font16Offset) + 3
|
ItemHeight = uspacing + (((_FONT = 8) * -1) * __UI_Font8Offset + ((_FONT = 16) * -1) * __UI_Font16Offset) + 3
|
||||||
This.ItemHeight = ItemHeight
|
This.ItemHeight = ItemHeight
|
||||||
TempText$ = __UI_TrimAt0$(Text(This.ID))
|
TempText$ = __UI_TrimAt0$(Text(This.ID))
|
||||||
ThisItem% = 0
|
ThisItem% = 0
|
||||||
|
Position& = 1
|
||||||
DO WHILE LEN(TempText$)
|
DO WHILE LEN(TempText$)
|
||||||
ThisItem% = ThisItem% + 1
|
ThisItem% = ThisItem% + 1
|
||||||
FindLF& = INSTR(TempText$, CHR$(10))
|
FindLF& = INSTR(Position&, TempText$, CHR$(10))
|
||||||
IF FindLF& THEN
|
IF FindLF& THEN
|
||||||
TempCaption$ = LEFT$(TempText$, FindLF& - 1)
|
TempCaption$ = MID$(TempText$, Position&, FindLF& - Position&)
|
||||||
TempText$ = MID$(TempText$, FindLF& + 1)
|
|
||||||
ELSE
|
ELSE
|
||||||
TempCaption$ = TempText$
|
TempCaption$ = MID$(TempText$, Position&)
|
||||||
TempText$ = ""
|
TempText$ = ""
|
||||||
END IF
|
END IF
|
||||||
|
Position& = FindLF& + 1
|
||||||
IF ThisItem% >= This.InputViewStart THEN
|
IF ThisItem% >= This.InputViewStart THEN
|
||||||
ThisItemTop% = ((ThisItem% - This.InputViewStart + 1) * ItemHeight - ItemHeight) + CaptionIndent
|
ThisItemTop% = ((ThisItem% - This.InputViewStart + 1) * ItemHeight - ItemHeight) + CaptionIndent
|
||||||
IF ThisItemTop% + ItemHeight > This.Height THEN _CONTINUE
|
IF ThisItemTop% + ItemHeight > This.Height THEN
|
||||||
|
IF This.Max = 0 THEN _CONTINUE
|
||||||
|
EXIT DO
|
||||||
|
END IF
|
||||||
LastVisibleItem = LastVisibleItem + 1
|
LastVisibleItem = LastVisibleItem + 1
|
||||||
|
|
||||||
IF ThisItem% = This.Value AND __UI_Focus = This.ID THEN Caption(This.ID) = TempCaption$
|
IF ThisItem% = This.Value AND __UI_Focus = This.ID THEN Caption(This.ID) = TempCaption$
|
||||||
|
@ -7967,7 +7971,7 @@ SUB __UI_DrawListBox (This AS __UI_ControlTYPE, ControlState)
|
||||||
END IF
|
END IF
|
||||||
LOOP
|
LOOP
|
||||||
|
|
||||||
This.Max = ThisItem%
|
IF This.Max = 0 THEN This.Max = ThisItem%
|
||||||
|
|
||||||
IF This.LastVisibleItem < LastVisibleItem THEN This.LastVisibleItem = LastVisibleItem
|
IF This.LastVisibleItem < LastVisibleItem THEN This.LastVisibleItem = LastVisibleItem
|
||||||
IF This.InputViewStart > This.Max THEN This.InputViewStart = 0
|
IF This.InputViewStart > This.Max THEN This.InputViewStart = 0
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
'Starting with v1.0, __UI_VersionNumber is actually the current build.
|
'Starting with v1.0, __UI_VersionNumber is actually the current build.
|
||||||
CONST __UI_Version = "v1.3"
|
Const __UI_Version = "v1.4"
|
||||||
CONST __UI_VersionNumber = 20
|
Const __UI_VersionNumber = 21
|
||||||
CONST __UI_VersionIsBeta = 0
|
Const __UI_VersionIsBeta = 0
|
||||||
CONST __UI_CopyrightSpan = "2016-2021"
|
Const __UI_CopyrightSpan = "2016-2021"
|
||||||
|
|
6128
InForm/UiEditor.bas
6128
InForm/UiEditor.bas
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue