From 78f83c459e51d2c14e360b68fedf7d1567fd6e44 Mon Sep 17 00:00:00 2001
From: Isuldor <git@isuldor.com>
Date: Sat, 16 Mar 2019 20:43:24 -0700
Subject: [PATCH] Rebuilt diff files, chatwindow needs a new minimal template
 after upstream changes

---
 README.md                 |   2 +-
 ui/EQUI_Animations.diff   | 329 +++-----------------------------------
 ui/EQUI_CastSpellWnd.diff |   2 +-
 ui/EQUI_ChatWindow.diff   |  82 +++-------
 ui/EQUI_HotButtonWnd.diff |   2 +-
 ui/EQUI_PlayerWindow.diff |   2 +-
 ui/EQUI_Templates.diff    |  62 ++-----
 7 files changed, 51 insertions(+), 430 deletions(-)

diff --git a/README.md b/README.md
index 95cb223..bc51fe8 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ WindowedModeYOffset=1
 AllowResize=1
 ```
 
-The window borders can be removed by a third party utility such as this [autohotkey script](http://gaming.stackexchange.com/a/17307/7413). Just make sure to perform the resize after logging into the character. If the resize occurs on the character selection screen, the renderer won't realize and you'll need to reset the resolution to fix screen stretching.
+The window borders can be removed by a third party utility such as this [autohotkey script](http://gaming.stackexchange.com/a/17307/7413). Just make sure to run the script as Admin, and perform the resize after logging into the character. If the resize occurs on the character selection screen, the renderer won't realize and you'll need to reset the resolution to fix screen stretching.
 ```autohotkey
     ^!h::
     IfWinExist EverQuest
diff --git a/ui/EQUI_Animations.diff b/ui/EQUI_Animations.diff
index 4d0812e..4eab80c 100644
--- a/ui/EQUI_Animations.diff
+++ b/ui/EQUI_Animations.diff
@@ -1,312 +1,21 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_Animations.xml	2019-02-25 13:12:11.000000000 -0800
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Animations.xml	2018-08-15 17:47:01.046516300 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Animations.xml	2019-03-16 15:38:00.018442000 -0700
 @@ -93,6 +93,18 @@
- 			<CY>256</CY>
- 		</Size>
- 	</TextureInfo>
-+	<TextureInfo item="dark_tile_64.tga">
-+		<Size>
-+			<CX>32</CX>
-+			<CY>32</CY>
-+		</Size>
-+	</TextureInfo>
-+	<TextureInfo item="dark_tile_192.tga">
-+		<Size>
-+			<CX>32</CX>
-+			<CY>32</CY>
-+		</Size>
-+	</TextureInfo>
- 	<TextureInfo item="wnd_bg_dark_rock.tga">
- 		<Size>
- 			<CX>256</CX>
-@@ -189,6 +201,24 @@
- 			<CY>256</CY>
- 		</Size>
- 	</TextureInfo>
-+	<TextureInfo item="mp_marketing.tga">
-+		<Size>
-+			<CX>512</CX>
-+			<CY>256</CY>
-+		</Size>
-+	</TextureInfo>
-+	<TextureInfo item="mp_marketing_charselect.tga">
-+		<Size>
-+			<CX>1024</CX>
-+			<CY>256</CY>
-+		</Size>
-+	</TextureInfo>
-+	<TextureInfo item="mp_titlebanner.tga">
-+		<Size>
-+			<CX>512</CX>
-+			<CY>64</CY>
-+		</Size>
-+	</TextureInfo>
- 	<TextureInfo item="new_item.tga">
- 		<Size>
- 			<CX>128</CX>
-@@ -2174,108 +2204,57 @@
- 			</Hotspot>
- 		</Frames>
- 	</Ui2DAnimation>
--	<Ui2DAnimation item="A_ROS">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>0</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
--	<Ui2DAnimation item="A_ROSHover">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>32</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
--	<Ui2DAnimation item="A_ROSSelected">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>64</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
--	<Ui2DAnimation item="A_TBL">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>96</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
--	<Ui2DAnimation item="A_TBLHover">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>128</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
--	<Ui2DAnimation item="A_TBLSelected">
--		<Frames>
--			<Texture>EQ_expansion_logos2.tga</Texture>
--			<Location>
--				<X>128</X>
--				<Y>160</Y>
--			</Location>
--			<Size>
--				<CX>128</CX>
--				<CY>32</CY>
--			</Size>
--			<Hotspot>
--				<X>0</X>
--				<Y>0</Y>
--			</Hotspot>
--		</Frames>
--	</Ui2DAnimation>
-+  <Ui2DAnimation item="A_ROS">
-+    <Frames>
-+      <Texture>EQ_expansion_logos2.tga</Texture>
-+      <Location>
-+        <X>128</X>
-+        <Y>0</Y>
-+      </Location>
-+      <Size>
-+        <CX>128</CX>
-+        <CY>32</CY>
-+      </Size>
-+      <Hotspot>
-+        <X>0</X>
-+        <Y>0</Y>
-+      </Hotspot>
-+    </Frames>
-+  </Ui2DAnimation>
-+  <Ui2DAnimation item="A_ROSHover">
-+    <Frames>
-+      <Texture>EQ_expansion_logos2.tga</Texture>
-+      <Location>
-+        <X>128</X>
-+        <Y>32</Y>
-+      </Location>
-+      <Size>
-+        <CX>128</CX>
-+        <CY>32</CY>
-+      </Size>
-+      <Hotspot>
-+        <X>0</X>
-+        <Y>0</Y>
-+      </Hotspot>
-+    </Frames>
-+  </Ui2DAnimation>
-+  <Ui2DAnimation item="A_ROSSelected">
-+    <Frames>
-+      <Texture>EQ_expansion_logos2.tga</Texture>
-+      <Location>
-+        <X>128</X>
-+        <Y>64</Y>
-+      </Location>
-+      <Size>
-+        <CX>128</CX>
-+        <CY>32</CY>
-+      </Size>
-+      <Hotspot>
-+        <X>0</X>
-+        <Y>0</Y>
-+      </Hotspot>
-+    </Frames>
-+  </Ui2DAnimation>
- 	<Ui2DAnimation item="A_Quarm">
- 		<Frames>
- 			<Texture>Achievement_hunter_collect_base.tga</Texture>
-@@ -6216,6 +6195,20 @@
- 		</Frames>
- 	</Ui2DAnimation>
- 	<!-- Chat Window Border -->
-+	<Ui2DAnimation item="A_ChatWindowTitlePlaceholder">
-+		<Cycle>true</Cycle>
-+		<Frames>
-+			<Texture>window_pieces05.tga</Texture>
-+			<Location>
-+				<X>254</X>
-+				<Y>240</Y>
-+			</Location>
-+			<Size>
-+				<CX>2</CX>
-+				<CY>16</CY>
-+			</Size>
-+		</Frames>
-+	</Ui2DAnimation>
- 	<Ui2DAnimation item="A_ChatWindowTitleLeft">
- 		<Cycle>true</Cycle>
- 		<Frames>
-@@ -8211,8 +8204,84 @@
- 			<Duration>1000</Duration>
- 		</Frames>
- 	</Ui2DAnimation>
-+	<Ui2DAnimation item="A_MarketingBanner">
-+		<Cycle>true</Cycle>
-+		<Frames>
-+			<Texture>mp_marketing.tga</Texture>
-+			<Location>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Location>
-+			<Size>
-+				<CX>395</CX>
-+				<CY>160</CY>
-+			</Size>
-+			<Hotspot>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Hotspot>
-+			<Duration>1000</Duration>
-+		</Frames>
-+	</Ui2DAnimation>
-+	<Ui2DAnimation item="A_MarketingBanner_CharSelect">
-+		<Cycle>true</Cycle>
-+		<Frames>
-+			<Texture>mp_marketing_charselect.tga</Texture>
-+			<Location>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Location>
-+			<Size>
-+				<CX>656</CX>
-+				<CY>160</CY>
-+			</Size>
-+			<Hotspot>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Hotspot>
-+			<Duration>1000</Duration>
-+		</Frames>
-+	</Ui2DAnimation>
-+	<Ui2DAnimation item="A_MarketplaceLogo">
-+		<Cycle>true</Cycle>
-+		<Frames>
-+			<Texture>mp_titlebanner.tga</Texture>
-+			<Location>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Location>
-+			<Size>
-+				<CX>405</CX>
-+				<CY>60</CY>
-+			</Size>
-+			<Hotspot>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Hotspot>
-+			<Duration>1000</Duration>
-+		</Frames>
-+	</Ui2DAnimation>
- 
- 	<!-- Border for pieces inside windows -->
-+	<Ui2DAnimation item="A_InnerFramePlaceholder">
-+		<Cycle>true</Cycle>
-+		<Frames>
-+			<Texture>window_pieces01.tga</Texture>
-+			<Location>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Location>
-+			<Size>
-+				<CX>2</CX>
-+				<CY>2</CY>
-+			</Size>
-+			<Hotspot>
-+				<X>0</X>
-+				<Y>0</Y>
-+			</Hotspot>
-+			<Duration>1000</Duration>
-+		</Frames>
-+	</Ui2DAnimation>
- 	<Ui2DAnimation item="A_InnerFrameTopLeft">
- 		<Cycle>true</Cycle>
- 		<Frames>
+ 			<CY>256</CY>
+ 		</Size>
+ 	</TextureInfo>
++ 	<TextureInfo item="dark_tile_64.tga">
++ 		<Size>
++ 			<CX>32</CX>
++ 			<CY>32</CY>
++ 		</Size>
++ 	</TextureInfo>
++ 	<TextureInfo item="dark_tile_192.tga">
++ 		<Size>
++ 			<CX>32</CX>
++ 			<CY>32</CY>
++ 		</Size>
++ 	</TextureInfo>
+ 	<TextureInfo item="wnd_bg_dark_rock.tga">
+ 		<Size>
+ 			<CX>256</CX>
diff --git a/ui/EQUI_CastSpellWnd.diff b/ui/EQUI_CastSpellWnd.diff
index 260d4d1..691e69a 100644
--- a/ui/EQUI_CastSpellWnd.diff
+++ b/ui/EQUI_CastSpellWnd.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_CastSpellWnd.xml	2018-05-25 12:25:14.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_CastSpellWnd.xml	2018-08-15 14:09:46.474666500 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_CastSpellWnd.xml	2019-03-16 15:38:00.044441300 -0700
 @@ -357,13 +357,13 @@
  			<CY>373</CY>
  		</Size>
diff --git a/ui/EQUI_ChatWindow.diff b/ui/EQUI_ChatWindow.diff
index 7ce6219..8b60763 100644
--- a/ui/EQUI_ChatWindow.diff
+++ b/ui/EQUI_ChatWindow.diff
@@ -1,64 +1,20 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_ChatWindow.xml	2019-03-12 13:58:42.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_ChatWindow.xml	2018-08-15 16:30:05.988353700 -0700
-@@ -2,8 +2,8 @@
- <XML ID="EQInterfaceDefinitionLanguage">
- 	<Schema xmlns="EverQuestData" xmlns:dt="EverQuestDataTypes" />
- 	<Editbox item="CW_ChatInput">
--		<ScreenID>CW_ChatInput</ScreenID>
--		<DrawTemplate>WDT_Inner</DrawTemplate>
-+		<ScreenID>CWChatInput</ScreenID>
-+		<DrawTemplate>less_WDT_Inner</DrawTemplate>
- 		<RelativePosition>true</RelativePosition>
- 		<AutoStretch>true</AutoStretch>
- 		<LeftAnchorOffset>2</LeftAnchorOffset>
-@@ -13,11 +13,10 @@
- 		<TopAnchorToTop>false</TopAnchorToTop>
- 		<RightAnchorToLeft>false</RightAnchorToLeft>
- 		<BottomAnchorToTop>false</BottomAnchorToTop>
--		<Style_Transparent>true</Style_Transparent>
- 	</Editbox>
- 	<STMLbox item="CW_ChatOutput">
--		<ScreenID>CW_ChatOutput</ScreenID>
--		<DrawTemplate>WDT_Inner</DrawTemplate>
-+		<ScreenID>CWChatOutput</ScreenID>
-+		<DrawTemplate>less_WDT_Inner</DrawTemplate>
- 		<RelativePosition>true</RelativePosition>
- 		<Style_VScroll>true</Style_VScroll>
- 		<AutoStretch>true</AutoStretch>
-@@ -27,22 +26,25 @@
- 		<BottomAnchorOffset>22</BottomAnchorOffset>
- 		<RightAnchorToLeft>false</RightAnchorToLeft>
- 		<BottomAnchorToTop>false</BottomAnchorToTop>
--		<Style_Border>true</Style_Border>
--		<Style_Transparent>true</Style_Transparent>
- 	</STMLbox>
- 	<Screen item="ChatWindow">
--		<RelativePosition>true</RelativePosition>
--		<AutoStretch>true</AutoStretch>
--		<TopAnchorToTop>true</TopAnchorToTop>
--		<BottomAnchorToTop>false</BottomAnchorToTop>
--		<LeftAnchorToLeft>true</LeftAnchorToLeft>
--		<RightAnchorToLeft>false</RightAnchorToLeft>
-+		<RelativePosition>false</RelativePosition>
-+		<Location>
-+			<X>95</X>
-+			<Y>280</Y>
-+		</Location>
-+		<Size>
-+			<CX>421</CX>
-+			<CY>200</CY>
-+		</Size>
- 		<Style_VScroll>false</Style_VScroll>
- 		<Style_HScroll>false</Style_HScroll>
--		<Style_Transparent>true</Style_Transparent>
--		<DrawTemplate>WDT_Def2</DrawTemplate>
-+		<DrawTemplate>WDT_minimalChat_Def</DrawTemplate>
-+		<Style_Titlebar>true</Style_Titlebar>
-+		<Style_Closebox>true</Style_Closebox>
-+		<Style_Minimizebox>true</Style_Minimizebox>
- 		<Style_Border>true</Style_Border>
--		<Style_Sizable>false</Style_Sizable>
-+		<Style_Sizable>true</Style_Sizable>
- 		<Escapable>false</Escapable>
- 		<Pieces>CW_ChatOutput</Pieces>
- 		<Pieces>CW_ChatInput</Pieces>
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_ChatWindow.xml	2019-03-16 20:27:11.624383600 -0700
+@@ -3,7 +3,7 @@
+ 	<Schema xmlns="EverQuestData" xmlns:dt="EverQuestDataTypes" />
+ 	<Editbox item="CW_ChatInput">
+ 		<ScreenID>CW_ChatInput</ScreenID>
+-		<DrawTemplate>WDT_Inner</DrawTemplate>
++ 		<DrawTemplate>WDT_InnerNull</DrawTemplate>
+ 		<RelativePosition>true</RelativePosition>
+ 		<AutoStretch>true</AutoStretch>
+ 		<LeftAnchorOffset>2</LeftAnchorOffset>
+@@ -17,7 +17,7 @@
+ 	</Editbox>
+ 	<STMLbox item="CW_ChatOutput">
+ 		<ScreenID>CW_ChatOutput</ScreenID>
+-		<DrawTemplate>WDT_Inner</DrawTemplate>
+++		<DrawTemplate>WDT_InnerNull</DrawTemplate>
+ 		<RelativePosition>true</RelativePosition>
+ 		<Style_VScroll>true</Style_VScroll>
+ 		<AutoStretch>true</AutoStretch>
diff --git a/ui/EQUI_HotButtonWnd.diff b/ui/EQUI_HotButtonWnd.diff
index 462dc71..bbe1baa 100644
--- a/ui/EQUI_HotButtonWnd.diff
+++ b/ui/EQUI_HotButtonWnd.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_HotButtonWnd.xml	2018-05-25 12:26:04.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_HotButtonWnd.xml	2018-08-15 17:46:19.405548300 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_HotButtonWnd.xml	2019-03-16 15:38:00.061440800 -0700
 @@ -4,17 +4,13 @@
  	<Ui2DAnimation item="A_HotButton1Normal">
  		<Cycle>true</Cycle>
diff --git a/ui/EQUI_PlayerWindow.diff b/ui/EQUI_PlayerWindow.diff
index 7b9004f..7209f9a 100644
--- a/ui/EQUI_PlayerWindow.diff
+++ b/ui/EQUI_PlayerWindow.diff
@@ -1,5 +1,5 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_PlayerWindow.xml	2018-04-09 20:54:48.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml	2018-08-14 16:01:57.964793400 -0700
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml	2019-03-16 15:38:00.080441200 -0700
 @@ -272,8 +272,8 @@
  			<EndCapRight>A_GaugeEndCapRight</EndCapRight>
  		</GaugeDrawTemplate>
diff --git a/ui/EQUI_Templates.diff b/ui/EQUI_Templates.diff
index c713581..9d15c5e 100644
--- a/ui/EQUI_Templates.diff
+++ b/ui/EQUI_Templates.diff
@@ -1,54 +1,10 @@
 --- /mnt/d/EverQuest/uifiles/default/EQUI_Templates.xml	2017-09-07 15:13:29.000000000 -0700
-+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Templates.xml	2018-08-15 17:27:26.694903200 -0700
-@@ -638,6 +638,51 @@
- 			<OverlapBottom>0</OverlapBottom>
- 		</Titlebar>
- 	</WindowDrawTemplate>
-+	<WindowDrawTemplate item="WDT_minimalChat_Def">
-+		<Background>dark_tile_192.tga</Background>
-+		<CloseBox>
-+			<Normal>A_CloseBtnNormal</Normal>
-+			<Pressed>A_CloseBtnPressed</Pressed>
-+			<Flyby>A_CloseBtnFlyby</Flyby>
-+			<Disabled>A_CloseBtnDisabled</Disabled>
-+			<PressedFlyby>A_CloseBtnPressedFlyby</PressedFlyby>
-+		</CloseBox>
-+		<QMarkBox>
-+			<Normal>A_QMarkBtnNormal</Normal>
-+			<Pressed>A_QMarkBtnPressed</Pressed>
-+			<Flyby>A_QMarkBtnFlyby</Flyby>
-+			<Disabled>A_QMarkBtnDisabled</Disabled>
-+			<PressedFlyby>A_QMarkBtnPressedFlyby</PressedFlyby>
-+		</QMarkBox>
-+		<MinimizeBox>
-+			<Normal>A_MinimizeBtnNormal</Normal>
-+			<Pressed>A_MinimizeBtnPressed</Pressed>
-+			<Flyby>A_MinimizeBtnFlyby</Flyby>
-+			<Disabled>A_MinimizeBtnDisabled</Disabled>
-+			<PressedFlyby>A_MinimizeBtnPressedFlyby</PressedFlyby>
-+		</MinimizeBox>
-+		<MaximizeBox>
-+			<Normal>A_MaximizeBtnNormal</Normal>
-+			<Pressed>A_MaximizeBtnPressed</Pressed>
-+			<Flyby>A_MaximizeBtnFlyby</Flyby>
-+			<Disabled>A_MaximizeBtnDisabled</Disabled>
-+			<PressedFlyby>A_MaximizeBtnPressedFlyby</PressedFlyby>
-+		</MaximizeBox>
-+		<Border>
-+			<Top>A_InnerFramePlaceholder</Top>
-+			<Right>A_InnerFramePlaceholder</Right>
-+			<Bottom>A_InnerFramePlaceholder</Bottom>
-+			<Left>A_InnerFramePlaceholder</Left>
-+			<OverlapLeft>0</OverlapLeft>
-+			<OverlapTop>0</OverlapTop>
-+			<OverlapRight>0</OverlapRight>
-+			<OverlapBottom>0</OverlapBottom>
-+		</Border>
-+		<Titlebar>
-+			<Left>A_ChatWindowTitlePlaceholder</Left>
-+		</Titlebar>
-+	</WindowDrawTemplate>
-+    <WindowDrawTemplate item="less_WDT_Inner" />
- 	<WindowDrawTemplate item="WDT_Inner">
- 		<Background>wnd_bg_light_rock.tga</Background>
- 		<VSBTemplate>
++++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_Templates.xml	2019-03-16 20:26:49.451185400 -0700
+@@ -638,6 +638,7 @@
+ 			<OverlapBottom>0</OverlapBottom>
+ 		</Titlebar>
+ 	</WindowDrawTemplate>
++    <WindowDrawTemplate item="WDT_InnerNull" />
+ 	<WindowDrawTemplate item="WDT_Inner">
+ 		<Background>wnd_bg_light_rock.tga</Background>
+ 		<VSBTemplate>