Fix pop up skin coords

C0rvust · Jul 4, 2023 · ac42f51 · ac42f51
1 parent 67a1b71
commit ac42f51
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/PopUp/Battery_PopUp.ini b/PopUp/Battery_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Body.Element#*2+#Body.Padding#*2)
 
 ; Do not change
 Parent.Position=1394
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 Format=0
 Format0=%3!i! Hours %2!i! Minutes

diff --git a/PopUp/NowPlaying_PopUp.ini b/PopUp/NowPlaying_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Body.Element#*10)
 
 ; Do not change
 Parent.Position=600
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 MiniCoverSize=178
 @IncludeMediaSwitcher=#@#Modules\NowPlaying\Include\MediaSwitcher.inc

diff --git a/PopUp/Power_PopUp.ini b/PopUp/Power_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Body.Element#*1+#Body.Padding#*2)
 
 ; Do not change
 Parent.Position=23.5
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 Module.Power.Element=(#Body.Element#*1)
 Module.Power.Delay=5

diff --git a/PopUp/Shortcut_PopUp.ini b/PopUp/Shortcut_PopUp.ini
@@ -22,8 +22,8 @@ Skin.Height=(#Module.Shortcut.ItemSize#*(#Module.Shortcut.GennedItemCount#+1))
 
 ; Do not change
 Parent.Position=1015.5
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 Module.Shortcut.GennedItemCount=0
 Module.Shortcut.ItemSize=(round(#Body.Element#*0.8))

diff --git a/PopUp/Taskbar_PopUp.ini b/PopUp/Taskbar_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Module.Taskbar.ItemSize#*#Module.Taskbar.GennedItemCount#+2*#Body.
 
 ; Do not change
 Parent.Position=172
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 Module.Taskbar.GennedItemCount=1
 Module.Taskbar.ItemSize=(round(#Body.Element#*0.8))

diff --git a/PopUp/Template_PopUp.ini b/PopUp/Template_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Body.Element#*10)
 
 ; Do not change
 Parent.Position=0
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?0:1)=0?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 [Module.Template.Border]
 Meter=Shape

diff --git a/PopUp/Time_PopUp.ini b/PopUp/Time_PopUp.ini
@@ -24,8 +24,8 @@ Skin.Height=(7*#Module.Time.ItemSize#+3*#Body.Padding#)
 
 ; Do not change
 Parent.Position=1162
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 
 WeekdayOffset=0
 

diff --git a/PopUp/Volume_PopUp.ini b/PopUp/Volume_PopUp.ini
@@ -19,8 +19,8 @@ Skin.Height=(#Body.Element#*2+#Body.Padding#*2)
 
 ; Do not change
 Parent.Position=1094
-Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+#Body.Width#-#Skin.Width#)))
-Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#):(#Body.Y#-#body.PopUp#-#Skin.Height#)))
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
 Format=(((#Format#=0?1:0)=0?1:0)=0?1:0)
 
 [Module.Volume.StyleInfoString]