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

Few more fixes related to recent ListBox changes. Also:

Browse source 
- TrackBar gets updated more often based on property changes.
This commit is contained in:
FellippeHeitor 2020-02-16 17:34:22 -03:00
parent 50963d542a
commit 666449f390
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
InForm/InForm.ui
View file

@ -75,9 +75,13 @@ TYPE __UI_ControlTYPE
Value AS _FLOAT Value AS _FLOAT
PreviousValue AS _FLOAT PreviousValue AS _FLOAT
Min AS _FLOAT Min AS _FLOAT
PrevMin AS _FLOAT
Max AS _FLOAT Max AS _FLOAT
PrevMax AS _FLOAT
Interval AS _FLOAT Interval AS _FLOAT
PrevInterval AS _FLOAT
MinInterval AS _FLOAT MinInterval AS _FLOAT
PrevMinInterval AS _FLOAT
HotKey AS INTEGER HotKey AS INTEGER
HotKeyOffset AS INTEGER HotKeyOffset AS INTEGER
HotKeyPosition AS INTEGER HotKeyPosition AS INTEGER
@ -7659,7 +7663,9 @@ SUB __UI_DrawTrackBar (This AS __UI_ControlTYPE, ControlState)
IF This.Disabled THEN TempControlState = 5 IF This.Disabled THEN TempControlState = 5
IF This.Redraw OR This.ControlState <> TempControlState OR This.FocusState <> (__UI_Focus = This.ID) OR This.Value <> This.PreviousValue OR This.PreviousParentID <> This.ParentID _ IF This.Redraw OR This.ControlState <> TempControlState OR This.FocusState <> (__UI_Focus = This.ID) OR This.Value <> This.PreviousValue OR This.PreviousParentID <> This.ParentID _
OR __UI_ForceRedraw OR This.PreviousFont <> This.Font THEN OR __UI_ForceRedraw OR This.PreviousFont <> This.Font OR _
This.PrevMin <> This.Min OR This.PrevMax <> This.Max OR _
This.PrevInterval <> This.Interval OR This.PrevMinInterval <> This.MinInterval THEN
'Last time this control was drawn it had a different state/caption, so it'll be redrawn 'Last time this control was drawn it had a different state/caption, so it'll be redrawn
This.Redraw = False This.Redraw = False
This.ControlState = TempControlState This.ControlState = TempControlState
@ -7669,6 +7675,10 @@ SUB __UI_DrawTrackBar (This AS __UI_ControlTYPE, ControlState)
__UI_StateHasChanged = True __UI_StateHasChanged = True
This.PreviousValue = This.Value This.PreviousValue = This.Value
END IF END IF
This.PrevMin = This.Min
This.PrevMax = This.Max
This.PrevInterval = This.Interval
This.PrevMinInterval = This.MinInterval
IF This.ParentID THEN Control(This.ParentID).ChildrenRedrawn = True IF This.ParentID THEN Control(This.ParentID).ChildrenRedrawn = True
This.PreviousParentID = This.ParentID This.PreviousParentID = This.ParentID
@ -8073,7 +8083,7 @@ SUB __UI_DrawListBox (This AS __UI_ControlTYPE, ControlState)
END IF END IF
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 EXIT DO IF ThisItemTop% + ItemHeight > This.Height THEN _CONTINUE
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$
@ -8107,6 +8117,8 @@ SUB __UI_DrawListBox (This AS __UI_ControlTYPE, ControlState)
This.Max = ThisItem% 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.Value > This.Max THEN This.Value = 0
IF This.Max > This.LastVisibleItem THEN IF This.Max > This.LastVisibleItem THEN
This.HasVScrollbar = True This.HasVScrollbar = True
@ -8317,7 +8329,7 @@ SUB __UI_DrawDropdownList (This AS __UI_ControlTYPE, ControlState)
ThisItem% = 0 ThisItem% = 0
DO WHILE LEN(TempText$) DO WHILE LEN(TempText$)
ThisItem% = ThisItem% + 1 ThisItem% = ThisItem% + 1
FindLF& = INSTR(TempText$, CHR$(13)) FindLF& = INSTR(TempText$, CHR$(10))
IF FindLF& THEN IF FindLF& THEN
TempCaption$ = LEFT$(TempText$, FindLF& - 1) TempCaption$ = LEFT$(TempText$, FindLF& - 1)
TempText$ = MID$(TempText$, FindLF& + 1) TempText$ = MID$(TempText$, FindLF& + 1)

4
InForm/UiEditor.bas
View file

@ -5000,7 +5000,7 @@ END SUB
'adapted from ide_methods.bas (QB64): 'adapted from ide_methods.bas (QB64):
FUNCTION idezfilelist$ (path$, method, depth%, TotalFound AS INTEGER) 'method0=*.frm and *.frmbin, method1=*.* FUNCTION idezfilelist$ (path$, method, depth%, TotalFound AS INTEGER) 'method0=*.frm and *.frmbin, method1=*.*
DIM sep AS STRING * 1, filelist$, a$ DIM sep AS STRING * 1, filelist$, a$
sep = CHR$(13) sep = CHR$(10)
TotalFound = 0 TotalFound = 0
$IF WIN THEN $IF WIN THEN
@ -5059,7 +5059,7 @@ END FUNCTION
FUNCTION idezpathlist$ (path$, TotalFound%) FUNCTION idezpathlist$ (path$, TotalFound%)
DIM sep AS STRING * 1, a$, pathlist$, c AS INTEGER, x AS INTEGER, b$ DIM sep AS STRING * 1, a$, pathlist$, c AS INTEGER, x AS INTEGER, b$
DIM i AS INTEGER DIM i AS INTEGER
sep = CHR$(13) sep = CHR$(10)
TotalFound% = 0 TotalFound% = 0
$IF WIN THEN $IF WIN THEN