Fresh IDE . Check-in [42fddbb2cb]
Not logged in

This repository is a mirror!

The original is located on: https://fresh.flatassembler.net/fossil/repo/fresh
If you want to follow the project, please update your remote-url

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Removed missing files from some test projects. Fixed missing field in the win_gui theme.
Timelines: family | ancestors | descendants | both | FreshLibDev
Files: files | file ages | folders
SHA1:42fddbb2cb4b49a6c590b246b4fe6a535c21331d
User & Date: johnfound 2017-10-26 16:59:26
Context
2017-10-26
17:03
Added omitted image from the test images. check-in: 75d2706524 user: johnfound tags: FreshLibDev
16:59
Removed missing files from some test projects. Fixed missing field in the win_gui theme. check-in: 42fddbb2cb user: johnfound tags: FreshLibDev
2017-05-30
05:29
Added constants in sqlite equates. Simplified markdown parser (some projects may need recompilation). check-in: d91b182aa9 user: johnfound tags: FreshLibDev
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to freshlib/gui/themes/win_gui.asm.

65
66
67
68
69
70
71

72
73
74
75
76
77
78
              clProgressBar,      HEX, $ff0a246c,                            \
              progressBorder,     NUM, bxSunken,                             \
\
\ ; TScrollbar colors and styles
\
              clScrollBk,         HEX, <$80d4d0c8, $d0d4d0c8>,                               \
              clScrollSlider,     HEX, <$c0808080, $ff808080>,                               \

              borderScroll,       NUM, bxRaised,                                             \
              scrollWidth,        NUM, 12,                                                   \
              minSliderHeight,    NUM, 24,                                                   \
\
\ ; TLabel colors and styles
\
              clLabelBk,          HEX, $00ffffff,                                            \







>







65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
              clProgressBar,      HEX, $ff0a246c,                            \
              progressBorder,     NUM, bxSunken,                             \
\
\ ; TScrollbar colors and styles
\
              clScrollBk,         HEX, <$80d4d0c8, $d0d4d0c8>,                               \
              clScrollSlider,     HEX, <$c0808080, $ff808080>,                               \
              clScrollSliderOvf,  HEX, <$c0ff8080, $ffff8080>,                               \
              borderScroll,       NUM, bxRaised,                                             \
              scrollWidth,        NUM, 12,                                                   \
              minSliderHeight,    NUM, 24,                                                   \
\
\ ; TLabel colors and styles
\
              clLabelBk,          HEX, $00ffffff,                                            \

Changes to freshlib/test_code0/TestDeflate.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestEdit.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestMenu.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestNewGUI.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestSplitGrid.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestText.asm.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68


69
70
71
72


73
74
75
76
77
78
79
...
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196

include "%lib%/freshlib.asm"


iglobal
TemplateMainForm:
        ObjTemplate  tfParent or tfEnd, TForm, frmMain, \
                     x, 100,        \
                     y, 50,         \
                     width, 1024,    \
                     height, 600,   \
                     Visible, TRUE, \
                     OnDestroy, FormOnDestroy,  \
                     Caption, 'Fresh portable Win32/Linux application test.'

          ObjTemplate  tfChild, TButton, btnChild1,          \
                     x, 48,         \
                     y, 48,         \
                     width, 80,     \
                     height, 48,    \
                     TextAlign, dtfAlignLeft or dtfAlignMiddle or dtfCRLF or dtfWordWrap,\
                     Caption, 'Button BRAVO',        \
                     Visible, TRUE, \
                     OnClick, Button1Click

          ObjTemplate  tfChild or tfEnd, TButton, btnChild2,          \
                     x, 48,         \
                     y, 100,         \
                     width, 80,     \
                     height, 48,    \
                     TextAlign, dtfAlignLeft or dtfAlignMiddle or dtfCRLF or dtfWordWrap,\
                     Caption, 'Button 2',        \
                     Visible, TRUE, \
                     OnClick, Button2Click
endg


rb 423




start:
        InitializeAll


        create  [pApplication], TApplication

        stdcall CreateFromTemplate, TemplateMainForm, 0
        set     [pApplication], TApplication:MainWindow, frmMain



        stdcall Run

        FinalizeAll
        stdcall TerminateAll, 0


................................................................................
.width dd ?
.height dd ?
.y      dd ?
.start  dd ?
begin
        pushad

        DebugMsg 'Button2 clicked'

        stdcall FontCreate4, 'Ubuntu', 16, 900, ffUnderline
        mov     [.font], eax

        stdcall CreateImage, 1024, 600
        mov     esi, eax

        mov     edi, [frmMain]
        stdcall AllocateContext, [edi+TWindow.handle]
        mov     edi, eax

        stdcall DrawSolidRect, esi, 0, 0, 1024, 600,  $ffd0d0d8
        stdcall DrawSolidRect, esi, 320, 0, 320, 480, $ff0000ff

        stdcall GetFontMetrics, [.font]
        mov     [.height], eax


        stdcall GetTimestamp
        mov     [.start], eax

        mov     edx, 7
        mov     ecx, -100

        mov     ecx, 1000
        mov     [.y], 5

.loop:
; 85 characters text
;        stdcall DrawString2, esi, 'uon ravo s s smpe ex, spaye y reeype rary usng reeype cace.', -1, 150, [.y], [.font], $ff000000
        stdcall DrawString2, esi, 'Button BRAVO This is simple text, displayed by FreeType library using FreeType cache.', -1, 150, [.y], [.font], $ff000000

        mov     [.width], eax

        mov     edx, ebx
        add     ebx, [.y]
        neg     edx
;        stdcall DrawSolidRect, esi, 150, ebx, eax, 1, $ffff0000
;        stdcall DrawSolidRect, esi, 150, [.y], eax, 1, $ffff0000

;        stdcall GetTextBounds2, 'Button BRAVO This is simple text, displayed by FreeType library using FreeType cache.', -1, [.font]

        mov     eax, [.height]
        add     [.y], eax

        dec     ecx
        jnz     .loop

        stdcall GetTimestamp
        sub     eax, [.start]

        stdcall NumToStr, eax, ntsUnsigned or ntsDec
        push    eax

        stdcall StrPtr, eax
        stdcall DrawString2, esi, eax, -1, 40, 500, [.font], $ff000000
        stdcall StrDel ; from the stack

        stdcall NumToStr, [.width], ntsDec or ntsSigned
        push    eax

        stdcall StrPtr, eax
        stdcall DrawString2, esi, eax, -1, 40, 520, [.font], $ff000000
        stdcall StrDel ; from the stack


        stdcall NumToStr, [.height], ntsDec or ntsUnsigned
        push    eax

        stdcall StrPtr, eax
        stdcall DrawString2, esi, eax, -1, 40, 540, [.font], $ff000000
        stdcall StrDel ; from the stack




        stdcall DrawImage, edi, esi, 0, 0

        stdcall FontDestroy2, [.font]

        popad
        return
endp








|
|
|
|
|
|
|


|
|
|
|
|
|
|
|


|
|
|
|
|
|
|
|










>
>




>
>







 







|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|




25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
...
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200

include "%lib%/freshlib.asm"


iglobal
TemplateMainForm:
        ObjTemplate  tfParent or tfEnd, TForm, frmMain, \
                     x = 100,        \
                     y = 50,         \
                     width = 1024,    \
                     height = 600,   \
                     Visible = FALSE, \
                     OnDestroy = FormOnDestroy,  \
                     Caption = 'Fresh portable Win32/Linux application test.'

          ObjTemplate  tfChild, TButton, btnChild1,          \
                     x = 48,         \
                     y = 48,         \
                     width = 80,     \
                     height = 48,    \
                     TextAlign = dtfAlignLeft or dtfAlignMiddle or dtfCRLF or dtfWordWrap,\
                     Caption = 'Button BRAVO',        \
                     Visible = TRUE, \
                     OnClick = Button1Click

          ObjTemplate  tfChild or tfEnd, TButton, btnChild2,          \
                     x = 48,         \
                     y = 100,         \
                     width = 80,     \
                     height = 48,    \
                     TextAlign = dtfAlignLeft or dtfAlignMiddle or dtfCRLF or dtfWordWrap,\
                     Caption = 'Button 2',        \
                     Visible = TRUE, \
                     OnClick = Button2Click
endg


rb 423




start:
        InitializeAll

        call    GUI.Init
        create  [pApplication], TApplication

        stdcall CreateFromTemplate, TemplateMainForm, 0
        set     [pApplication], TApplication:MainWindow, frmMain

        set     [frmMain], TForm:Visible, TRUE

        stdcall Run

        FinalizeAll
        stdcall TerminateAll, 0


................................................................................
.width dd ?
.height dd ?
.y      dd ?
.start  dd ?
begin
        pushad

;        DebugMsg 'Button2 clicked'
;
;        stdcall FontCreate, 'Ubuntu', 16, 900, ffUnderline
;        mov     [.font], eax
;
;        stdcall CreateImage, 1024, 600
;        mov     esi, eax
;
;        mov     edi, [frmMain]
;        stdcall AllocateContext, [edi+TWindow.handle]
;        mov     edi, eax
;
;        stdcall DrawSolidRect, esi, 0, 0, 1024, 600,  $ffd0d0d8
;        stdcall DrawSolidRect, esi, 320, 0, 320, 480, $ff0000ff
;
;        stdcall GetFontMetrics, [.font]
;        mov     [.height], eax
;
;
;        stdcall GetTimestamp
;        mov     [.start], eax
;
;        mov     edx, 7
;        mov     ecx, -100
;
;        mov     ecx, 1000
;        mov     [.y], 5
;
;.loop:
;; 85 characters text
;;        stdcall DrawString2, esi, 'uon ravo s s smpe ex, spaye y reeype rary usng reeype cace.', -1, 150, [.y], [.font], $ff000000
;        stdcall DrawString2, esi, 'Button BRAVO This is simple text, displayed by FreeType library using FreeType cache.', -1, 150, [.y], [.font], $ff000000
;
;        mov     [.width], eax
;
;        mov     edx, ebx
;        add     ebx, [.y]
;        neg     edx
;;        stdcall DrawSolidRect, esi, 150, ebx, eax, 1, $ffff0000
;;        stdcall DrawSolidRect, esi, 150, [.y], eax, 1, $ffff0000
;
;;        stdcall GetTextBounds2, 'Button BRAVO This is simple text, displayed by FreeType library using FreeType cache.', -1, [.font]
;
;        mov     eax, [.height]
;        add     [.y], eax
;
;        dec     ecx
;        jnz     .loop
;
;        stdcall GetTimestamp
;        sub     eax, [.start]
;
;        stdcall NumToStr, eax, ntsUnsigned or ntsDec
;        push    eax
;
;        stdcall StrPtr, eax
;        stdcall DrawString2, esi, eax, -1, 40, 500, [.font], $ff000000
;        stdcall StrDel ; from the stack
;
;        stdcall NumToStr, [.width], ntsDec or ntsSigned
;        push    eax
;
;        stdcall StrPtr, eax
;        stdcall DrawString2, esi, eax, -1, 40, 520, [.font], $ff000000
;        stdcall StrDel ; from the stack
;
;
;        stdcall NumToStr, [.height], ntsDec or ntsUnsigned
;        push    eax
;
;        stdcall StrPtr, eax
;        stdcall DrawString2, esi, eax, -1, 40, 540, [.font], $ff000000
;        stdcall StrDel ; from the stack
;
;
;
;
;        stdcall DrawImage, edi, esi, 0, 0
;
;        stdcall FontDestroy2, [.font]
;
        popad
        return
endp

Changes to freshlib/test_code0/TestText.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/TestThemes.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/ThemesConfigBuild.fpr.

cannot compute difference between binary files

Changes to freshlib/test_code0/theme_flat.cfg.

24
25
26
27
28
29
30

31
32
33
34
35
36
37
clDialogTxt = $FF000000
clSplitter = $FF34495E
clProgressBk = $FFECF0F1
clProgressBar = $FF1ABC9C
progressBorder = 3
clScrollBk = $3FBDC3C7, $A0BDC3C7
clScrollSlider = $7F7F8C8D, $FF1ABC9C

borderScroll = 0
scrollWidth = 12
minSliderHeight = 24
clLabelBk = $0
clLabelTxt = $FF000000
clTreeViewBack = $FFECF0F1
clTreeViewText = $FF000000







>







24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
clDialogTxt = $FF000000
clSplitter = $FF34495E
clProgressBk = $FFECF0F1
clProgressBar = $FF1ABC9C
progressBorder = 3
clScrollBk = $3FBDC3C7, $A0BDC3C7
clScrollSlider = $7F7F8C8D, $FF1ABC9C
clScrollSliderOvf = $3FF39C12, $FFF39C12
borderScroll = 0
scrollWidth = 12
minSliderHeight = 24
clLabelBk = $0
clLabelTxt = $FF000000
clTreeViewBack = $FFECF0F1
clTreeViewText = $FF000000

Changes to freshlib/test_code0/theme_win.cfg.

24
25
26
27
28
29
30

31
32
33
34
35
36
37
clDialogTxt = $FF000000
clSplitter = $FF606060
clProgressBk = $FFD4D0C8
clProgressBar = $FF0A246C
progressBorder = 2
clScrollBk = $80D4D0C8, $D0D4D0C8
clScrollSlider = $C0808080, $FF808080

borderScroll = 1
scrollWidth = 12
minSliderHeight = 24
clLabelBk = $FFFFFF
clLabelTxt = $FF000000
clTreeViewBack = $FFFFFFFF
clTreeViewText = $FF000000







>







24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
clDialogTxt = $FF000000
clSplitter = $FF606060
clProgressBk = $FFD4D0C8
clProgressBar = $FF0A246C
progressBorder = 2
clScrollBk = $80D4D0C8, $D0D4D0C8
clScrollSlider = $C0808080, $FF808080
clScrollSliderOvf = $C0FF8080, $FFFF8080
borderScroll = 1
scrollWidth = 12
minSliderHeight = 24
clLabelBk = $FFFFFF
clLabelTxt = $FF000000
clTreeViewBack = $FFFFFFFF
clTreeViewText = $FF000000