Merge pull request #5 from Jax-Core/v2

V2

Author: EnhancedJax

@Resources/Actions/HotKeys.ini

@@ -38,12 +38,23 @@ LeftMouseDownAction=[!SetOption MediaHoverCircle Stroke "Stroke Color #FontColor
 ;                                   Function                                   ;
 ; ---------------------------------------------------------------------------- ;
 
+
+[mVolume]
+OnUpdateAction=[!SetOption VolumeString Text """[&Func:volumeLevel()]"""][!SetOption VolumeString FontFace "#FontFace#"]
+
+[mBrightness]
+IfCondition=(mBrightness == 0)
+IfTrueAction=[!SetOption VolumeString Text "[\xEC8A]"][!SetOption VolumeString FontFace "Segoe MDL2 Assets"]
+IfCondition2=(mBrightness > 0)
+IfTrueAction2=[!SetOption VolumeString Text "[\xE706]"][!SetOption VolumeString FontFace "Segoe MDL2 Assets"]
+IfConditionMode=1
+
 [FrostedGlass]
 Measure=Plugin
 Plugin=FrostedGlass
 Type=#Blur#
 Corner=#BlurCorner#
-Border=None
+Border=All
 
 [SysColor]
 Measure=Plugin
@@ -56,11 +67,20 @@ Disabled=(1-#SysAccent#)
 
 ; --------------------------------- VolumeBar -------------------------------- ;
 
+[StrokeB]
+Meter=Shape
+X=#Border#
+Y=#Border#
+Shape=Rectangle 0,0,(#VolumeW#+#MediaW#*#MusicVisible#),(#H#),#StaticWin11Corner# | Stroke Color #FontColor#,50 | StrokeWidth (#Border#*#Scale#) | Fill Color 0,0,0,0
+DynamicVariables=1
+Group=Standard | Music
+Hidden=(1-#Border#)
+
 [VolumeB]
 Meter=Shape
-X=1
-Y=1
-Shape=Rectangle 0,0,#VolumeW#,#H#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity#
+X=r
+Y=r
+Shape=Rectangle 0,0,#VolumeW#,#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color #PrimaryColor#,#PrimaryOpacity#
 Group=Standard
 DynamicVariables=1
 MouseScrollUpAction=[!CommandMeasure "mVolume" "ChangeVolume 2"][!UpdateMeasure mVolume]
@@ -69,7 +89,7 @@ MouseScrollDownAction=[!CommandMeasure "mVolume" "ChangeVolume -2"][!UpdateMeasu
 Meter=Shape
 X=r
 Y=r
-Shape=Rectangle 0,0,#VolumeW#,#H#,[&Func:returnCorner()] | StrokeWidth 0
+Shape=Rectangle 0,0,#VolumeW#,#H#,#StaticWin11Corner# | StrokeWidth 0
 Group=Standard
 DynamicVariables=1
 
@@ -110,10 +130,10 @@ Container=VolumeC
 
 [MediaB]
 Meter=Shape
-X=1
+X=r
 Y=r
-Shape=Rectangle 0,0,(#MediaW#+#VolumeW#),#H#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity#
-Shape2=Rectangle 0,0,#VolumeW#,#H#,([&Func:returnCorner()]+1) | StrokeWidth #Stroke#
+Shape=Rectangle 0,0,(#MediaW#+#VolumeW#),#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color #PrimaryColor#,#PrimaryOpacity#
+Shape2=Rectangle 0,0,#VolumeW#,#H#,(#StaticWin11Corner#+1) | StrokeWidth 0
 Shape3=Combine Shape | XOR Shape2
 Shape4=Line #VolumeW#,(#P#),#VolumeW#,(#P#+(#H#-#P#*2)*#TweenNode1#) | StrokeStartCap Round | StrokeEndCap ROund | StrokeWidth (1*#Scale#) | Stroke Color #FontColor#,50
 DynamicVariables=1
@@ -123,7 +143,7 @@ Meter=Shape
 X=(#VolumeW#)
 Y=r
 DynamicVariables=1
-Shape=Rectangle 0,0,(#MediaW#*#TweenNode1#+1),#H#,[&Func:returnCorner()] | StrokeWidth 0 | Fill Color 255,255,255,(255*#TweenNode1#)
+Shape=Rectangle 0,0,(#MediaW#*#TweenNode1#+1),#H#,#StaticWin11Corner# | StrokeWidth 0 | Fill Color 255,255,255,(255*#TweenNode1#)
 Group=Music | Standard | Animated
 
 [MediaImage]
@@ -296,16 +316,16 @@ Container=MediaC
 
 [LocksB]
 Meter=Shape
-X=1
-Y=1
-Shape=Rectangle 0,0,#LocksW#,#LocksH#,[&Func:returnCorner()] | StrokeWidth #Stroke# | Fill Color #PrimaryColor#,#PrimaryOpacity# | Stroke Color #SecondaryColor#,#SecondaryOpacity#
+X=#Border#
+Y=#Border#
+Shape=Rectangle 0,0,#LocksW#,#LocksH#,#StaticWin11Corner# | StrokeWidth (#Border#*#Scale#) | Fill Color #PrimaryColor#,#PrimaryOpacity# | Stroke Color #FontColor#,50 
 Group=Locks | Special
 Hidden=1
 [LocksC]
 Meter=Shape
 X=r
 Y=r
-Shape=Rectangle 0,0,#LocksW#,#LocksH#,[&Func:returnCorner()] | StrokeWidth 0
+Shape=Rectangle 0,0,#LocksW#,#LocksH#,#StaticWin11Corner# | StrokeWidth 0
 Group=Locks | Special
 Hidden=1
 
@@ -334,6 +354,10 @@ Hidden=1
 Text=[\xe73a]
 [LocksIcon.Off:S]
 Text=[\xe739]
+[FlightIcon.On:S]
+Text=[\xe709]
+[FlightIcon.Off:S]
+Text=[\xe709]
 
 
 

@Resources/Actions/Source code/YourFlyouts.ahk

@@ -1,8 +1,8 @@
 [Variables]
-Height=180
+Height=200
 
 FontFace=Segoe UI
-Stroke=0
+Border=1
 Cap=Round
 
 PrimaryColor=12,12,12