Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit31dbae3

Browse files
committed
0.0.0.7 update
- Added some Ansi and Wide versions of functions- Removed use of CTEXT macro- Recompiled all controls and examples against updated ModernUI library
1 parentdd20260 commit31dbae3

File tree

219 files changed

+9709
-8135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+9709
-8135
lines changed

‎Controls/ModernUI_Animation/ModernUI_Animation.asm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
;
33
; ModernUI Control - ModernUI_Animation
44
;
5-
; Copyright (c)2019 by fearless
5+
; Copyright (c)2023 by fearless
66
;
77
; All Rights Reserved
88
;
Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
#ifdef__cplusplus
2+
extern"C" {
3+
#endif
4+
5+
#ifdef_MSC_VER// MSVC compiler
6+
#defineMUI_EXPORT __declspec(dllexport) __stdcall
7+
#else
8+
#defineMUI_EXPORT
9+
#endif
10+
11+
12+
//------------------------------------------------------------------------------
13+
// ModernUI_Animation Prototypes
14+
//------------------------------------------------------------------------------
15+
voidMUI_EXPORTMUIAnimationRegister();// Use 'ModernUI_Animation' as class in RadASM custom class control
16+
HWNDMUI_EXPORTMUIAnimationCreateHWNDhWndParent,DWORDxpos,DWORDypos,DWORDdwWidth,DWORDdwHeight,DWORDdwResourceID,DWORDdwStyle);
17+
unsignedintMUI_EXPORTMUIAnimationSetProperty(HWNDhModernUI_Animation,DWORDdwProperty,DWORDdwPropertyValue);
18+
unsignedintMUI_EXPORTMUIAnimationGetProperty(HWNDhModernUI_Animation,DWORDdwProperty);
19+
20+
// Add image handle (bitmap, icon or png) as an animation frame image
21+
boolMUI_EXPORTMUIAnimationAddFrame(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpMuiAnimationFrameStruct);
22+
boolMUI_EXPORTMUIAnimationAddFrames(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpArrayMuiAnimationFrameStructs,DWORDdwCount);
23+
// Load an image resource id (bitmap, icon or png) as an animation frame image
24+
boolMUI_EXPORTMUIAnimationLoadFrame(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpMuiAnimationFrameStruct);
25+
boolMUI_EXPORTMUIAnimationLoadFrames(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpArrayMuiAnimationFrameStructs,DWORDdwCount);
26+
// Create a series of animation frames images from a sprite sheet
27+
boolMUI_EXPORTMUIAnimationAddSpriteSheet(HWNDhModernUI_Animation,DWORDdwImageType,HANDLEhImageSpriteSheet,DWORDdwSpriteCount,POINTER*lpFrameTimes,DWORDdwFrameTimeSize,DWORDdwFrameTimeType);
28+
boolMUI_EXPORTMUIAnimationLoadSpriteSheet(HWNDhModernUI_Animation,DWORDdwImageType,DWORDidResSpriteSheet,DWORDdwSpriteCount,POINTER*lpFrameTimes,DWORDdwFrameTimeSize,DWORDdwFrameTimeType);
29+
// Insert image handle as an animation frame image
30+
boolMUI_EXPORTMUIAnimationInsertFrame(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpMuiAnimationFrameStruct,DWORDdwFrameIndex,BOOLbInsertBefore);
31+
boolMUI_EXPORTMUIAnimationInsertFrames(HWNDhModernUI_Animation,DWORDdwImageType,POINTER*lpArrayMuiAnimationFrameStructs,DWORDdwCount,DWORDdwFrameIndex,BOOLbInsertBefore);
32+
33+
// Frame Operations
34+
boolMUI_EXPORTMUIAnimationClear(HWNDhModernUI_Animation);
35+
boolMUI_EXPORTMUIAnimationDeleteFrames(HWNDhModernUI_Animation);
36+
boolMUI_EXPORTMUIAnimationDeleteFrame(HWNDhModernUI_Animation,DWORDdwFrameIndex);
37+
boolMUI_EXPORTMUIAnimationMoveFrame(HWNDhModernUI_Animation,DWORDdwFrameIndexFrom,DWORDdwFrameIndexTo);
38+
boolMUI_EXPORTMUIAnimationCopyFrame(HWNDhModernUI_Animation,DWORDdwFrameIndexFrom,DWORDdwFrameIndexTo);
39+
boolMUI_EXPORTMUIAnimationCropFrame(HWNDhModernUI_Animation,DWORDdwFrameIndex,LPRECT*lpRect);
40+
boolMUI_EXPORTMUIAnimationCropFrames(HWNDhModernUI_Animation,LPRECT*lpRect);
41+
42+
// Save frames to file
43+
boolMUI_EXPORTMUIAnimationExportSpriteSheet(HWNDhModernUI_Animation,DWORDdwImageType,LPCSTR*lpszSpritesheetFilename,LPCSTR*lpszFrameTimesFilename);
44+
boolMUI_EXPORTMUIAnimationExportFrame(HWNDhModernUI_Animation,DWORDdwImageType,LPCSTR*lpszFrameFilename,DWORDdwFrameIndex);
45+
boolMUI_EXPORTMUIAnimationExportFrames(HWNDhModernUI_Animation,DWORDdwImageType,LPCSTR*lpszFrameFolder,LPCSTR*lpszFilePrefix,BOOLbFileFrameNo);
46+
47+
// Load frames from file
48+
boolMUI_EXPORTMUIAnimationImportSpriteSheet(HWNDhModernUI_Animation,DWORDdwImageType,LPCSTR*lpszSpritesheetFilename,LPCSTR*lpszFrameTimesFilename);
49+
boolMUI_EXPORTMUIAnimationImportFrame(HWNDhModernUI_Animation,DWORDdwImageType,LPCSTR*lpszFrameFilename,DWORDdwFrameIndex);
50+
51+
// Frame Information
52+
boolMUI_EXPORTMUIAnimationGetFrameInfo(HWNDhModernUI_Animation,DWORDdwFrameIndex,POINTER*lpMuiAnimationFrameStruct);
53+
HANDLEMUI_EXPORTMUIAnimationGetFrameImage(HWNDhModernUI_Animation,DWORDdwFrameIndex,POINTER*lpdwFrameType);
54+
unsignedintMUIAnimationGetFrameTime(HWNDhModernUI_Animation,DWORDdwFrameIndex);
55+
56+
boolMUI_EXPORTMUIAnimationSetFrameInfo(HWNDhModernUI_Animation,DWORDdwFrameIndex,POINTER*lpMuiAnimationFrameStruct);
57+
boolMUI_EXPORTMUIAnimationSetFrameImage(HWNDhModernUI_Animation,DWORDdwFrameIndex,DWORDdwFrameType,HANDLEhFrameImage);
58+
boolMUI_EXPORTMUIAnimationSetFrameTime(HWNDhModernUI_Animation,DWORDdwFrameIndex,DWORDdwFrameTime);
59+
60+
// Animation control
61+
voidMUI_EXPORTMUIAnimationStart(HWNDhModernUI_Animation);
62+
voidMUI_EXPORTMUIAnimationStop(HWNDhModernUI_Animation);
63+
voidMUI_EXPORTMUIAnimationPause(HWNDhModernUI_Animation);
64+
voidMUI_EXPORTMUIAnimationResume(HWNDhModernUI_Animation);
65+
voidMUI_EXPORTMUIAnimationStep(HWNDhModernUI_Animation,BOOLbReverse);
66+
voidMUI_EXPORTMUIAnimationSpeed(HWNDhModernUI_Animation,FLOATfSpeedFactor);
67+
68+
voidMUI_EXPORTMUIAnimationSetDefaultTime(HWNDhModernUI_Animation,DWORDdwDefaultFrameTime);
69+
70+
voidMUI_EXPORTMUIAnimationNotifyCallback(HWNDhModernUI_Animation,POINTER*lpNMAnimationStruct);
71+
72+
73+
//------------------------------------------------------------------------------
74+
// ModernUI_Animation Messages
75+
//------------------------------------------------------------------------------
76+
#defineMUIAM_ADDFRAME WM_USER+1752 // wParam = dwImageType, lParam = lpAnimationFrameStruct
77+
#defineMUIAM_LOADFRAME WM_USER+1751 // wParam = dwImageType, lParam = idResImage
78+
#defineMUIAM_START WM_USER+1750 // wParam & lParam = NULL
79+
#defineMUIAM_STOP WM_USER+1749 // wParam & lParam = NULL
80+
#defineMUIAM_STEP WM_USER+1748 // wParam = bReverse
81+
#defineMUIAM_SPEED WM_USER+1745 // wParam = dwSpeedFactor
82+
83+
84+
//------------------------------------------------------------------------------
85+
// ModernUI_Animation Notifications
86+
//------------------------------------------------------------------------------
87+
#defineMUIAN_STOP 0 // Animation is stopped
88+
#defineMUIAN_START 1 // Animation has started
89+
#defineMUIAN_PAUSE 2 // Animation is paused
90+
#defineMUIAN_RESUME 3 // Animation has resumed
91+
#defineMUIAN_STEP 4 // Animation stepping
92+
#defineMUIAN_FRAME 5 // Occurs every frame shown
93+
94+
95+
//------------------------------------------
96+
// ModernUI_Animation Structures
97+
//------------------------------------------
98+
IFNDEFMUI_ANIMATION_FRAME// lpMuiAnimationFrameStruct
99+
typedefstructMUI_ANIMATION_FRAME
100+
{
101+
DWORDdwFrameType,// DWORD. Image type: MUIAIT_BMP, MUIAIT_ICO, MUIAIT_PNG
102+
DWORDdwFrameImage,// DWORD/HANDLE. Handle or resource ID of image: Bitmap, Icon or PNG (RT_BITMAP, RT_ICON or RT_RCDATA resource)
103+
DWORDdwFrameTime,// DWORD. Frame time in milliseconds
104+
DWORDlParam// DWORD. Custom user specified value
105+
}
106+
ENDIF
107+
108+
IFNDEFMUI_ANIMATION_FT_FULL// For array of frame times for every frame in array
109+
typedefstructMUI_ANIMATION_FT_FULL
110+
{
111+
DWORDdwFrameTime
112+
}
113+
ENDIF
114+
115+
IFNDEFMUI_ANIMATION_FT_COMPACT// For array of frame times for specified frame indexes in each entry
116+
typedefstructMUI_ANIMATION_FT_COMPACT
117+
{
118+
DWORDdwFrameID,
119+
DWORDdwFrameTime
120+
}
121+
ENDIF
122+
123+
IFNDEFNM_ANIMATION_FRAME// ModernUI_Animation Notification Item
124+
typedefstructNM_ANIMATION_FRAME
125+
{
126+
DWORDdwFrameIndex,// DWORD. Frame index
127+
DWORDdwFrameType,// DWORD. Image type: MUIAIT_BMP, MUIAIT_ICO, MUIAIT_PNG
128+
DWORDdwFrameImage,// HANDLE. Handle of image: Bitmap, Icon or PNG
129+
DWORDdwFrameTime,// DWORD. Frame time in milliseconds
130+
DWORDlParam// DWORD. Custom user specified value
131+
}
132+
ENDIF
133+
134+
IFNDEFNM_ANIMATION// Notification Message Structure for ModernUI_Animation
135+
typedefstructNM_ANIMATION
136+
{
137+
NMHDRhdr,
138+
NM_ANIMATION_FRAMEitem
139+
}
140+
ENDIF
141+
142+
143+
//------------------------------------------
144+
// ModernUI_Animation Styles
145+
//
146+
//------------------------------------------
147+
#defineMUIAS_NOSTRETCH 0x0
148+
#defineMUIAS_NOCENTER 0x1
149+
#defineMUIAS_CENTER 0x2
150+
#defineMUIAS_STRETCH 0x3
151+
#defineMUIAS_LCLICK 0x4
152+
#defineMUIAS_RCLICK 0x8
153+
#defineMUIAS_HAND 0x10
154+
#defineMUIAS_CONTROL 0x20
155+
156+
//------------------------------------------------------------------------------
157+
// ModernUI_Animation Properties: Use with MUIAnimationSetProperty /
158+
// MUIAnimationGetProperty or MUI_SETPROPERTY / MUI_GETPROPERTY msgs
159+
//------------------------------------------------------------------------------
160+
#defineAnimationBackColor 0 // RGBCOLOR. Background color of animation
161+
#defineAnimationBorderColor 4 // RGBCOLOR. Border color of animation
162+
#defineAnimationLoop 8 // BOOL. Loop animation back to start. Default is TRUE
163+
#defineAnimationNotifications 12 // BOOL. Allow notifications via WM_NOTIFY. Default is TRUE
164+
#defineAnimationNotifyCallback 16 // DWORD. Address of custom notifications callback function (MUIAnimationNotifyCallback)
165+
#defineAnimationDllInstance 20 // DWORD. Instance of DLL if using control in a DLL
166+
#defineAnimationParam 24 // DWORD. Custom user specified value
167+
168+
// Animation Image Type:
169+
#defineMUIAIT_NONE 0
170+
#defineMUIAIT_BMP 1
171+
#defineMUIAIT_ICO 2
172+
#defineMUIAIT_PNG 3
173+
174+
// Animation Frame Type:
175+
#defineMUIAFT_FULL 0
176+
#defineMUIAFT_COMPACT 1
177+
178+
179+
#ifdef__cplusplus
180+
}
181+
#endif

‎Controls/ModernUI_Animation/ModernUI_Animation.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
;
33
; ModernUI Control - ModernUI_Animation
44
;
5-
; Copyright (c)2019 by fearless
5+
; Copyright (c)2023 by fearless
66
;
77
; All Rights Reserved
88
;
4 Bytes
Binary file not shown.

‎Controls/ModernUI_Animation/ModernUI_Animation.rap‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ Group=Assembly,Misc
6464
[AutoLoad]
6565
AutoLoad=2,1,3,4,5,6,7
6666
[Size]
67-
3=0,0,0,0,2986
68-
4=0,0,0,0,314
69-
1=0,0,0,0,90590
70-
2=0,0,0,0,1196
71-
6=0,0,0,0,82
67+
3=0,0,0,0,537
68+
4=0,0,0,0,109
69+
1=0,0,0,0,144
70+
2=0,0,0,0,144
71+
6=0,0,0,0,111
7272
5=0,0,0,0,503
7373
7=0,0,0,0,0
7474
[VersionControl]
@@ -81,7 +81,7 @@ MilestoneOnTime=2
8181
MilestoneOnDate=0
8282
MilestoneOnDateWhen=1
8383
MilestoneOnDateStatus=0
84-
MilestoneOnDateDate=23
84+
MilestoneOnDateDate=18
8585
MilestoneOnDateTimeYear=2019
8686
MilestoneOnDateTimeMonth=7
8787
MilestoneOnDateTimeDate=1
@@ -105,7 +105,7 @@ ProductVer2Range=0
105105
ProductVer3Range=0
106106
ProductVer4Range=0
107107
[PTimer]
108-
PTimer=71247559
108+
PTimer=77268283
109109
[GroupExpand]
110110
GroupExpand=1,1,0
111111
[BookMark]
@@ -125,19 +125,20 @@ GroupExpand=1,1,0
125125
2=
126126
1=
127127
[Collapse]
128-
1=,,,,,16384,,
128+
1=,,,,,,,
129129
2=
130130
6=
131131
5=
132132
4=
133133
3=
134134
7=
135135
[Find]
136-
1="GdipDrawImage"
136+
1="fld"
137137
2="finit"
138-
3="SPINNER_USE_TIMERQUEUE"
139-
4="@AnimationFrameTimeDefault"
140-
5="MUIAnimationLoadSpriteSheet"
141-
6="MUIAIT_NONE,MUIAIT_BMP,MUIAIT_ICO,MUIAIT_PNG"
142-
7="_MUI_AnimationGetFrameImage"
143-
8="ANIMATION_FRAME"
138+
3="GdipDrawImage"
139+
4="SPINNER_USE_TIMERQUEUE"
140+
5="@AnimationFrameTimeDefault"
141+
6="MUIAnimationLoadSpriteSheet"
142+
7="MUIAIT_NONE,MUIAIT_BMP,MUIAIT_ICO,MUIAIT_PNG"
143+
8="_MUI_AnimationGetFrameImage"
144+
9="ANIMATION_FRAME"

‎Controls/ModernUI_Button/ModernUI_Button.asm‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
;
33
; ModernUI Control - ModernUI_Button
44
;
5-
; Copyright (c) 2018 by fearless
6-
;
7-
; All Rights Reserved
8-
;
9-
; http://www.LetTheLight.in
5+
; Copyright (c) 2023 by fearless
106
;
117
; http://github.com/mrfearless/ModernUI
128
;

‎Controls/ModernUI_Button/ModernUI_Button.inc‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
;
33
; ModernUI Control - ModernUI_Button
44
;
5-
; Copyright (c) 2018 by fearless
6-
;
7-
; All Rights Reserved
8-
;
9-
; http://www.LetTheLight.in
5+
; Copyright (c) 2023 by fearless
106
;
117
; http://github.com/mrfearless/ModernUI
128
;
4 Bytes
Binary file not shown.

‎Controls/ModernUI_Button/ModernUI_Button.rap‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ MilestoneOnTime=2
7676
MilestoneOnDate=0
7777
MilestoneOnDateWhen=1
7878
MilestoneOnDateStatus=0
79-
MilestoneOnDateDate=15
79+
MilestoneOnDateDate=18
8080
MilestoneOnDateTimeYear=2016
8181
MilestoneOnDateTimeMonth=5
8282
MilestoneOnDateTimeDate=30
@@ -100,18 +100,18 @@ ProductVer2Range=0
100100
ProductVer3Range=0
101101
ProductVer4Range=0
102102
[PTimer]
103-
PTimer=419071088
103+
PTimer=456695932
104104
[Collapse]
105-
1=4726848,,1006649598,,581632,131072,,131072,16787456,8456,,1063424
105+
1=20971520,,939524215,,17358848,,33554432,131072,16787456,270592,34816,14336
106106
2=
107107
3=
108108
4=
109109
5=
110110
6=
111111
7=
112112
[Size]
113-
1=0,0,0,0,112437
114-
2=0,0,0,0,36986
113+
1=0,0,0,0,154
114+
2=0,0,0,0,154
115115
3=0,0,0,0,1323
116116
4=0,0,0,0,3372
117117
5=0,0,0,0,8385
@@ -133,13 +133,13 @@ GroupExpand=1,1,0
133133
[BreakPoint]
134134
0=
135135
[Find]
136-
1="@ButtonBrush"
137-
2="@ButtonDPI"
138-
3="PUBLIC"
139-
4="PRIVATE"
140-
5="MUI_BUTTON_DEFAULT_THEME"
141-
6="TextExtent"
142-
7=";"
143-
8="@"
144-
9="EQU"
145-
10="EQU"
136+
1="WS_CLIP"
137+
2="MUIBM_NOTIFY"
138+
3="COLOR"
139+
4="@ButtonBrush"
140+
5="@ButtonDPI"
141+
6="PUBLIC"
142+
7="PRIVATE"
143+
8="MUI_BUTTON_DEFAULT_THEME"
144+
9="TextExtent"
145+
10=";"

‎Controls/ModernUI_CaptionBar/ModernUI_CaptionBar.asm‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
;
33
; ModernUI Control - ModernUI_CaptionBar
44
;
5-
; Copyright (c) 2018 by fearless
6-
;
7-
; All Rights Reserved
8-
;
9-
; http://www.LetTheLight.in
5+
; Copyright (c) 2023 by fearless
106
;
117
; http://github.com/mrfearless/ModernUI
128
;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp