Skip to content

Commit 7411a7f

Browse files
authored
Merge pull request #8 from NSTechBytes/working2
Working2
2 parents e226891 + 53ebe6f commit 7411a7f

File tree

16 files changed

+407
-61
lines changed

16 files changed

+407
-61
lines changed

Build-CPP.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#usage -----> powershell -ExecutionPolicy Bypass -Command "& {. .\Build-CPP.ps1; Dist -major 0 -minor 0 -patch 5}"
1+
#usage -----> powershell -ExecutionPolicy Bypass -Command "& {. .\Build-CPP.ps1; Dist -major 0 -minor 0 -patch 6}"
22
$msbuild = "C:\Program Files\Microsoft Visual Studio\2022\Community\Msbuild\Current\Bin\MSBuild.exe"
33

44
function Add-RMSkinFooter {

Resources/Skins/WebView2/BangCommand/BangCommand.ini

Lines changed: 73 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,20 @@ DynamicWindowSize=1
77
Name=BangCommand
88
Author=nstechbytes
99
Information=Demonstrates controlling WebView2 via !CommandMeasure bangs.
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212

1313
[Variables]
1414
WebURL=https://nstechbytes.pages.dev/
1515
WebW=600
16-
WebH=350
16+
WebH=500
1717
WebX=300
18-
WebY=25
18+
WebY=45
19+
ZoomFactor=1.0
1920
Hidden=0
21+
ClickThrough=0
22+
AllowDualControl=1
23+
2024
; ========================================
2125
; Measure
2226
; ========================================
@@ -28,15 +32,25 @@ W=#WebW#
2832
H=#WebH#
2933
X=#WebX#
3034
Y=#WebY#
35+
ZoomFactor=#ZoomFactor#
3136
Hidden=#Hidden#
37+
ClickThrough=#ClickThrough#
38+
AllowDualControl=#AllowDualControl#
39+
OnWebViewLoadAction=[!log "WebView loaded succesfully!"]
40+
OnWebViewFailAction=[!log "WebView failed :("]
41+
OnPageFirstLoadAction=[!log "First time on this page!"]
42+
OnPageLoadStartAction=[!log "Navigation has started!"]
43+
OnPageLoadingAction=[!log "Page is loading!"]
44+
OnPageLoadFinishAction=[!log "Navigation has finished!"]
45+
OnPageReloadAction=[!log "Page has been reloaded!"]
3246
DynamicVariables=1
3347

3448
; ========================================
3549
; Background
3650
; ========================================
3751
[MeterBackground]
3852
Meter=Shape
39-
Shape=Rectangle 0,0,950,420,12 | FillColor 0,0,0,200 | StrokeWidth 0
53+
Shape=Rectangle 0,0,920,570,12 | FillColor 0,0,0,200 | StrokeWidth 0
4054

4155
[Title]
4256
Meter=String
@@ -65,23 +79,23 @@ MeterStyle=StyleButtonText
6579
Text=Navigate to Google (via Variable)
6680
X=150
6781
Y=58
68-
LeftMouseUpAction=[!SetVariable WebURL "https://www.google.com"][!UpdateMeasure MeasureWebView][!Redraw]
82+
LeftMouseUpAction=[!SetVariable WebURL "https://www.google.com"][!UpdateMeasure MeasureWebView]
6983

7084
[TxtNavigateGitHub]
7185
Meter=String
7286
MeterStyle=StyleButtonText
7387
Text=Navigate to GitHub (via Variable)
7488
X=150
7589
Y=88
76-
LeftMouseUpAction=[!SetVariable WebURL "https://github.com"][!UpdateMeasure MeasureWebView][!Redraw]
90+
LeftMouseUpAction=[!SetVariable WebURL "https://github.com"][!UpdateMeasure MeasureWebView]
7791

78-
[TxtNavigateExample]
92+
[TxtNavigateForum]
7993
Meter=String
8094
MeterStyle=StyleButtonText
81-
Text=Navigate to Example (via Bang)
95+
Text=Navigate to Forum (via Bang)
8296
X=150
8397
Y=118
84-
LeftMouseUpAction=[!CommandMeasure MeasureWebView "Navigate https://example.com"]
98+
LeftMouseUpAction=[!CommandMeasure MeasureWebView "Navigate https://forum.rainmeter.net/"]
8599

86100
[TxtReload]
87101
Meter=String
@@ -119,7 +133,7 @@ W=122
119133
H=24
120134
X=86
121135
Y=208
122-
LeftMouseUpAction=[!SetVariable Hidden 0][!UpdateMeasure MeasureWebView][!Redraw]
136+
LeftMouseUpAction=[!SetVariable Hidden 0][!UpdateMeasure MeasureWebView]
123137

124138
[TxtHide]
125139
Meter=String
@@ -129,15 +143,15 @@ W=125
129143
H=24
130144
X=212
131145
Y=208
132-
LeftMouseUpAction=[!SetVariable Hidden 1][!UpdateMeasure MeasureWebView][!Redraw]
146+
LeftMouseUpAction=[!SetVariable Hidden 1][!UpdateMeasure MeasureWebView]
133147

134148
[TxtExecuteScript]
135149
Meter=String
136150
MeterStyle=StyleButtonText
137151
Text=Execute Script
138152
X=150
139153
Y=238
140-
LeftMouseUpAction=[!CommandMeasure MeasureWebView "ExecuteScript alert('Hello!')"]
154+
LeftMouseUpAction=[!CommandMeasure MeasureWebView "ExecuteScript console.log('Script has been executed.')"]
141155

142156
[TxtOpenDevTools]
143157
Meter=String
@@ -153,31 +167,73 @@ MeterStyle=StyleButtonText
153167
Text=Set Width: 500 (via Variable)
154168
X=150
155169
Y=298
156-
LeftMouseUpAction=[!SetVariable WebW 500][!UpdateMeasure MeasureWebView][!Redraw]
170+
LeftMouseUpAction=[!SetVariable WebW (#WebW#=600?500:600)][!UpdateMeasure MeasureWebView][!UpdateMeter #CURRENTSECTION#][!Redraw]
171+
DynamicVariables=1
157172

158173
[TxtSetHeight]
159174
Meter=String
160175
MeterStyle=StyleButtonText
161176
Text=Set Height: 400 (via Variable)
162177
X=150
163178
Y=328
164-
LeftMouseUpAction=[!SetVariable WebH 400][!UpdateMeasure MeasureWebView][!Redraw]
179+
LeftMouseUpAction=[!SetVariable WebH (#WebH#=410?470:410)][!UpdateMeasure MeasureWebView][!UpdateMeter #CURRENTSECTION#][!Redraw]
180+
DynamicVariables=1
165181

166182
[TxtSetX]
167183
Meter=String
168184
MeterStyle=StyleButtonText
169-
Text=Set X: 100 (via Variable)
185+
Text=Set X: 320 (via Variable)
170186
X=150
171187
Y=358
172-
LeftMouseUpAction=[!SetVariable WebX 100][!UpdateMeasure MeasureWebView][!Redraw]
188+
LeftMouseUpAction=[!SetVariable WebX (#WebX#=300?320:300)][!UpdateMeasure MeasureWebView][!UpdateMeter #CURRENTSECTION#][!Redraw]
189+
DynamicVariables=1
173190

174191
[TxtSetY]
175192
Meter=String
176193
MeterStyle=StyleButtonText
177194
Text=Set Y: 50 (via Variable)
178195
X=150
179196
Y=388
180-
LeftMouseUpAction=[!SetVariable WebY 50][!UpdateMeasure MeasureWebView][!Redraw]
197+
LeftMouseUpAction=[!SetVariable WebY (#WebY#=45?50:45)][!UpdateMeasure MeasureWebView][!UpdateMeter #CURRENTSECTION#][!Redraw]
198+
DynamicVariables=1
181199

200+
[TxtSetZoom]
201+
Meter=String
202+
MeterStyle=StyleButtonText
203+
Text=Set ZoomFactor: 2.0 (via Variable)
204+
X=150
205+
Y=418
206+
LeftMouseUpAction=[!SetVariable ZoomFactor (#ZoomFactor#=1?2:1)][!UpdateMeasure MeasureWebView][!UpdateMeter #CURRENTSECTION#][!Redraw]
207+
DynamicVariables=1
182208

209+
[TxtSetEnableClickThrough]
210+
Meter=String
211+
MeterStyle=StyleButtonText
212+
Text=Set ClickThrough: 1 (via Variable)
213+
X=150
214+
Y=448
215+
LeftMouseUpAction=[!SetVariable ClickThrough 1][!UpdateMeasure MeasureWebView]
183216

217+
[TxtSetDisableClickThrough]
218+
Meter=String
219+
MeterStyle=StyleButtonText
220+
Text=Set ClickThrough: 0 (via Variable)
221+
X=150
222+
Y=478
223+
LeftMouseUpAction=[!SetVariable ClickThrough 0][!UpdateMeasure MeasureWebView]
224+
225+
[TxtSetEnableAllowDualControl]
226+
Meter=String
227+
MeterStyle=StyleButtonText
228+
Text=Set AllowDualControl: 1 (Variable)
229+
X=150
230+
Y=508
231+
LeftMouseUpAction=[!SetVariable AllowDualControl 1][!UpdateMeasure MeasureWebView]
232+
233+
[TxtSetDisableAllowDualControl]
234+
Meter=String
235+
MeterStyle=StyleButtonText
236+
Text=Set AllowDualControl: 0 (Variable)
237+
X=150
238+
Y=538
239+
LeftMouseUpAction=[!SetVariable AllowDualControl 0][!UpdateMeasure MeasureWebView]

Resources/Skins/WebView2/Calendar/Calendar.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Update=1000
55
Name=Calendar
66
Author=nstechbytes
77
Information=Calendar Widget using WebView2
8-
Version=0.0.6
8+
Version=0.0.7
99
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1010
; ========================================
1111
; Measure

Resources/Skins/WebView2/Clock/Clock.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Update=1000
55
Name=Calendar
66
Author=nstechbytes
77
Information=Calendar Widget using WebView2
8-
Version=0.0.6
8+
Version=0.0.7
99
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1010
; ========================================
1111
; Measure

Resources/Skins/WebView2/InformationProperty/InformationProperty.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DynamicWindowSize=1
77
Name=InformationProperty
88
Author=nstechbytes
99
Information=Shows Rainmeter information properties via WebView2.
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212
; ========================================
1313
; Measure

Resources/Skins/WebView2/IslamicDate/IslamicDate.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Update=1000
55
Name=Islamic Date
66
Author=nstechbytes
77
Information=Islamic (Hijri) Date Widget using WebView2
8-
Version=0.0.6
8+
Version=0.0.7
99
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1010
; ========================================
1111
; Measure

Resources/Skins/WebView2/JSInteraction/JSInteraction.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DynamicWindowSize=1
77
Name=JSInteraction
88
Author=nstechbytes
99
Information=Demonstrates JavaScript interaction (OnInitialize, OnUpdate, CallJS) with the WebView2 plugin.
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212

1313
; ========================================

Resources/Skins/WebView2/ReadMeasureOption/ReadMeasureOption.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DynamicWindowSize=1
77
Name=ReadMeasureOption
88
Author=nstechbytes
99
Information=Demonstrates reading options from the current measure using the WebView2 plugin.
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212
; ========================================
1313
; Measure

Resources/Skins/WebView2/ReadSectionOption/ReadSectionOption.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DynamicWindowSize=1
77
Name=ReadSectionOption Demo
88
Author=nstechbytes
99
Information=Demonstrates reading options from other sections using WebView2
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212

1313
[Variables]

Resources/Skins/WebView2/UtilityFunction/UtilityFunction.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DynamicWindowSize=1
77
Name=UtilityFunction
88
Author=nstechbytes
99
Information=Demonstrates RainmeterAPI utility functions using the WebView2 plugin.
10-
Version=0.0.6
10+
Version=0.0.7
1111
License=Creative Commons Attribution-Non-Commercial-Share Alike 3.0
1212

1313
[Variables]

0 commit comments

Comments
 (0)