Skip to content

Commit 75da591

Browse files
Dutchman101Dutchman101
committed
Revert ""Default" skin remake/upscale (128x128 => 128x256) (#2829)"
This reverts commit e35fcf3. Rounded edges should be evaluated, and likely we should update "Default" skin with purely upscaling (no rounded edges.. take away what caused) & add another "Default v2" skin which has these rounded edges as it looks way better (further opinions on any PR that does this are required)
1 parent e35fcf3 commit 75da591

File tree

3 files changed

+131
-202
lines changed

3 files changed

+131
-202
lines changed

‎Shared/data/MTA San Andreas/skins/Default/CGUI.is.xml

Lines changed: 96 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,96 @@
1-
<Imageset AutoScaled="false" Imagefile="CGUI.png" Name="CGUI-Images" NativeHorzRes="800" NativeVertRes="600">
2-
<Image Height="8" Name="FrameTop" Width="16" XPos="44" YPos="164" />
3-
<Image Height="5" Name="ButtonTop" Width="22" XPos="41" YPos="128" />
4-
<Image Height="5" Name="Frame2Top" Width="22" XPos="6" YPos="128" />
5-
<Image Height="17" Name="FrameLeft" Width="8" XPos="36" YPos="172" />
6-
<Image Height="22" Name="ButtonLeft" Width="5" XPos="36" YPos="133" />
7-
<Image Height="22" Name="Frame2Left" Width="5" XPos="1" YPos="133" />
8-
<Image Height="17" Name="FrameRight" Width="8" XPos="60" YPos="172" />
9-
<Image Height="1" Name="HeaderLine" Width="1" XPos="87" YPos="189" />
10-
<Image Height="15" Name="MouseArrow" Width="11" XPos="2" YPos="0" />
11-
<Image Height="5" Name="SButtonTop" Width="22" XPos="6" YPos="164" />
12-
<Image Height="22" Name="ButtonRight" Width="5" XPos="63" YPos="133" />
13-
<Image Height="22" Name="Frame2Right" Width="5" XPos="28" YPos="133" />
14-
<Image Height="8" Name="FrameBottom" Width="16" XPos="44" YPos="189" />
15-
<Image Height="7" Name="ProgressTop" Width="1" XPos="52" YPos="31" />
16-
<Image Height="22" Name="SButtonLeft" Width="5" XPos="1" YPos="169" />
17-
<Image Height="22" Name="ShadowBrush" Width="22" XPos="6" YPos="133" />
18-
<Image Height="5" Name="TitleBarTop" Width="22" XPos="26" YPos="249" />
19-
<Image Height="6" Name="ButtonBottom" Width="22" XPos="41" YPos="155" />
20-
<Image Height="22" Name="ButtonCenter" Width="22" XPos="41" YPos="133" />
21-
<Image Height="16" Name="CheckboxMark" Width="16" XPos="89" YPos="37" />
22-
<Image Height="6" Name="Frame2Bottom" Width="22" XPos="6" YPos="155" />
23-
<Image Height="8" Name="FrameTopLeft" Width="8" XPos="36" YPos="164" />
24-
<Image Height="17" Name="GenericBrush" Width="16" XPos="44" YPos="172" />
25-
<Image Height="6" Name="LargeUpArrow" Width="9" XPos="5" YPos="29" />
26-
<Image Height="1" Name="ProgressLeft" Width="10" XPos="42" YPos="38" />
27-
<Image Height="22" Name="SButtonRight" Width="5" XPos="28" YPos="169" />
28-
<Image Height="3" Name="SmallUpArrow" Width="5" XPos="20" YPos="66" />
29-
<Image Height="5" Name="ButtonTopLeft" Width="5" XPos="36" YPos="128" />
30-
<Image Height="16" Name="CheckboxHover" Width="16" XPos="89" YPos="19" />
31-
<Image Height="5" Name="Frame2TopLeft" Width="5" XPos="1" YPos="128" />
32-
<Image Height="8" Name="FrameTopRight" Width="8" XPos="60" YPos="164" />
33-
<Image Height="1" Name="ProgressRight" Width="10" XPos="53" YPos="38" />
34-
<Image Height="6" Name="SButtonBottom" Width="22" XPos="6" YPos="191" />
35-
<Image Height="22" Name="SButtonCenter" Width="22" XPos="6" YPos="169" />
36-
<Image Height="19" Name="ScrollUpArrow" Width="19" XPos="0" YPos="22" />
37-
<Image Height="5" Name="ButtonTopRight" Width="5" XPos="63" YPos="128" />
38-
<Image Height="16" Name="CheckboxNormal" Width="16" XPos="89" YPos="1" />
39-
<Image Height="5" Name="Frame2TopRight" Width="5" XPos="28" YPos="128" />
40-
<Image Height="8" Name="HeaderSplitter" Width="2" XPos="68" YPos="35" />
41-
<Image Height="6" Name="LargeDownArrow" Width="9" XPos="5" YPos="74" />
42-
<Image Height="10" Name="LargeLeftArrow" Width="5" XPos="31" YPos="75" />
43-
<Image Height="7" Name="ProgressBottom" Width="1" XPos="52" YPos="39" />
44-
<Image Height="5" Name="SButtonTopLeft" Width="5" XPos="1" YPos="164" />
45-
<Image Height="20" Name="ScrollbarThumb" Width="19" XPos="45" YPos="49" />
46-
<Image Height="3" Name="SmallDownArrow" Width="5" XPos="26" YPos="66" />
47-
<Image Height="3" Name="SmallLeftArrow" Width="5" XPos="20" YPos="66" />
48-
<Image Height="4" Name="TitleBarBorder" Width="18" XPos="15" YPos="121" />
49-
<Image Height="8" Name="FrameBottomLeft" Width="8" XPos="36" YPos="189" />
50-
<Image Height="5" Name="HeaderMainBrush" Width="5" XPos="50" YPos="249" />
51-
<Image Height="10" Name="LargeRightArrow" Width="5" XPos="72" YPos="75" />
52-
<Image Height="10" Name="MouseEsWeCursor" Width="19" XPos="39" YPos="109" />
53-
<Image Height="22" Name="MouseMoveCursor" Width="22" XPos="104" YPos="104" />
54-
<Image Height="7" Name="ProgressTopLeft" Width="10" XPos="42" YPos="31" />
55-
<Image Height="16" Name="RadioButtonMark" Width="16" XPos="107" YPos="1" />
56-
<Image Height="5" Name="SButtonTopRight" Width="5" XPos="28" YPos="164" />
57-
<Image Height="19" Name="ScrollDownArrow" Width="19" XPos="0" YPos="65" />
58-
<Image Height="20" Name="ScrollLeftArrow" Width="20" XPos="22" YPos="70" />
59-
<Image Height="3" Name="SmallRightArrow" Width="5" XPos="26" YPos="66" />
60-
<Image Height="19" Name="TitleBarTopLeft" Width="18" XPos="44" YPos="200" />
61-
<Image Height="6" Name="ButtonBottomLeft" Width="5" XPos="36" YPos="155" />
62-
<Image Height="22" Name="Frame2Background" Width="22" XPos="6" YPos="133" />
63-
<Image Height="6" Name="Frame2BottomLeft" Width="5" XPos="1" YPos="155" />
64-
<Image Height="8" Name="FrameBottomRight" Width="8" XPos="60" YPos="189" />
65-
<Image Height="1" Name="HeaderBottomEdge" Width="32" XPos="71" YPos="162" />
66-
<Image Height="7" Name="ProgressTopRight" Width="10" XPos="53" YPos="31" />
67-
<Image Height="16" Name="RadioButtonHover" Width="16" XPos="107" YPos="19" />
68-
<Image Height="20" Name="ScrollRightArrow" Width="20" XPos="66" YPos="70" />
69-
<Image Height="19" Name="TitleBarTopRight" Width="18" XPos="64" YPos="200" />
70-
<Image Height="6" Name="ButtonBottomRight" Width="5" XPos="63" YPos="155" />
71-
<Image Height="16" Name="CheckboxMarkHover" Width="16" XPos="107" YPos="55" />
72-
<Image Height="6" Name="Frame2BottomRight" Width="5" XPos="28" YPos="155" />
73-
<Image Height="16" Name="RadioButtonNormal" Width="16" XPos="107" YPos="37" />
74-
<Image Height="6" Name="SButtonBottomLeft" Width="5" XPos="1" YPos="191" />
75-
<Image Height="1" Name="ProgressBackground" Width="1" XPos="52" YPos="38" />
76-
<Image Height="7" Name="ProgressBottomLeft" Width="10" XPos="42" YPos="39" />
77-
<Image Height="6" Name="SButtonBottomRight" Width="5" XPos="28" YPos="191" />
78-
<Image Height="19" Name="TitleBarBackground" Width="2" XPos="62" YPos="200" />
79-
<Image Height="20" Name="ComboboxButtonHover" Width="20" XPos="105" YPos="127" />
80-
<Image Height="10" Name="EWSizingCursorImage" Width="22" XPos="15" YPos="107" />
81-
<Image Height="8" Name="FrameTopLeftSquared" Width="8" XPos="71" YPos="164" />
82-
<Image Height="20" Name="HorzScrollContainer" Width="24" XPos="42" YPos="70" />
83-
<Image Height="22" Name="NSSizingCursorImage" Width="10" XPos="1" YPos="104" />
84-
<Image Height="7" Name="ProgressBottomRight" Width="10" XPos="53" YPos="39" />
85-
<Image Height="5" Name="TitleBarTopSelected" Width="22" XPos="2" YPos="249" />
86-
<Image Height="24" Name="VertScrollContainer" Width="19" XPos="0" YPos="41" />
87-
<Image Height="20" Name="ComboboxButtonNormal" Width="20" XPos="105" YPos="148" />
88-
<Image Height="5" Name="Frame2TopLeftSquared" Width="5" XPos="1" YPos="128" />
89-
<Image Height="8" Name="FrameTopRightSquared" Width="8" XPos="95" YPos="164" />
90-
<Image Height="16" Name="RadioButtonMarkHover" Width="16" XPos="107" YPos="73" />
91-
<Image Height="17" Name="ListboxSelectionBrush" Width="16" XPos="79" YPos="172" />
92-
<Image Height="18" Name="NESWSizingCursorImage" Width="18" XPos="83" YPos="104" />
93-
<Image Height="18" Name="NWSESizingCursorImage" Width="18" XPos="59" YPos="104" />
94-
<Image Height="15" Name="ProgressBarDimSegment" Width="5" XPos="74" YPos="31" />
95-
<Image Height="15" Name="ProgressBarLitSegment" Width="5" XPos="67" YPos="31" />
96-
<Image Height="8" Name="FrameBottomRightSquared" Width="8" XPos="95" YPos="189" />
97-
<Image Height="19" Name="TitleBarTopLeftSelected" Width="18" XPos="2" YPos="200" />
98-
<Image Height="6" Name="Frame2BottomRightSquared" Width="5" XPos="28" YPos="155" />
99-
<Image Height="19" Name="TitleBarTopRightSelected" Width="18" XPos="22" YPos="200" />
100-
<Image Height="19" Name="TitleBarBackgroundSelected" Width="2" XPos="20" YPos="200" />
101-
<Image Height="7" Name="TabTopLeft" Width="4" XPos="71" YPos="128" />
102-
<Image Height="7" Name="TabTop" Width="20" XPos="75" YPos="128" />
103-
<Image Height="7" Name="TabTopRight" Width="6" XPos="95" YPos="128" />
104-
<Image Height="25" Name="TabBackground" Width="20" XPos="75" YPos="135" />
105-
<Image Height="25" Name="TabLeft" Width="4" XPos="71" YPos="135" />
106-
<Image Height="25" Name="TabRight" Width="6" XPos="95" YPos="135" />
107-
</Imageset>
1+
<?xml version="1.0" ?>
2+
<Imageset Name="CGUI-Images" Imagefile="CGUI.png" NativeHorzRes="800" NativeVertRes="600" AutoScaled="false">
3+
<Image Name="GenericBrush" XPos="28" YPos="8" Width="1" Height="1" />
4+
<Image Name="ListboxSelectionBrush" XPos="28" YPos="8" Width="1" Height="1" />
5+
6+
<Image Name="FrameTopLeft" XPos="21" YPos="1" Width="8" Height="8" />
7+
<Image Name="FrameTopRight" XPos="29" YPos="1" Width="8" Height="8" />
8+
<Image Name="FrameBottomLeft" XPos="21" YPos="9" Width="8" Height="8" />
9+
<Image Name="FrameBottomRight" XPos="29" YPos="9" Width="8" Height="8" />
10+
<Image Name="FrameLeft" XPos="21" YPos="9" Width="8" Height="1" />
11+
<Image Name="FrameRight" XPos="29" YPos="9" Width="8" Height="1" />
12+
<Image Name="FrameTop" XPos="60" YPos="1" Width="1" Height="8" />
13+
<Image Name="FrameBottom" XPos="60" YPos="9" Width="1" Height="8" />
14+
<Image Name="FrameTopLeftSquared" XPos="57" YPos="1" Width="8" Height="8" />
15+
<Image Name="FrameTopRightSquared" XPos="58" YPos="1" Width="8" Height="8" />
16+
<Image Name="FrameBottomRightSquared" XPos="58" YPos="9" Width="8" Height="8" />
17+
<Image Name="ScrollUpArrow" XPos="1" YPos="20" Width="17" Height="22" />
18+
<Image Name="ScrollDownArrow" XPos="1" YPos="66" Width="17" Height="22" />
19+
<Image Name="VertScrollContainer" XPos="1" YPos="44" Width="17" Height="20" />
20+
<Image Name="ScrollLeftArrow" XPos="20" YPos="71" Width="22" Height="17" />
21+
<Image Name="ScrollRightArrow" XPos="66" YPos="71" Width="22" Height="17" />
22+
<Image Name="HorzScrollContainer" XPos="44" YPos="71" Width="20" Height="17" />
23+
<Image Name="ScrollbarThumb" XPos="47" YPos="50" Width="15" Height="16" />
24+
<Image Name="ShadowBrush" XPos="48" YPos="1" Width="24" Height="24" />
25+
26+
<Image Name="TitleBarBorder" XPos="21" YPos="27" Width="1" Height="1" />
27+
28+
<Image Name="TitleBarTop" XPos="46" YPos="20" Width="2" Height="8" />
29+
<Image Name="TitleBarTopLeft" XPos="39" YPos="20" Width="8" Height="8" />
30+
<Image Name="TitleBarTopRight" XPos="47" YPos="20" Width="8" Height="8" />
31+
<Image Name="TitleBarBackground" XPos="46" YPos="23" Width="3" Height="3" />
32+
33+
<Image Name="TitleBarTopSelected" XPos="28" YPos="20" Width="2" Height="8" />
34+
<Image Name="TitleBarTopLeftSelected" XPos="21" YPos="20" Width="8" Height="8" />
35+
<Image Name="TitleBarTopRightSelected" XPos="29" YPos="20" Width="8" Height="8" />
36+
<Image Name="TitleBarBackgroundSelected" XPos="28" YPos="23" Width="3" Height="3" />
37+
38+
<Image Name="Frame2TopLeftSquared" XPos="67" YPos="1" Width="8" Height="8" />
39+
<Image Name="Frame2BottomRightSquared" XPos="67" YPos="9" Width="8" Height="8" />
40+
41+
<Image Name="Frame2TopLeft" XPos="39" YPos="1" Width="8" Height="8" />
42+
<Image Name="Frame2TopRight" XPos="47" YPos="1" Width="8" Height="8" />
43+
<Image Name="Frame2BottomLeft" XPos="39" YPos="9" Width="8" Height="8" />
44+
<Image Name="Frame2BottomRight" XPos="47" YPos="9" Width="8" Height="8" />
45+
<Image Name="Frame2Left" XPos="39" YPos="8" Width="8" Height="1" />
46+
<Image Name="Frame2Right" XPos="47" YPos="8" Width="8" Height="1" />
47+
<Image Name="Frame2Top" XPos="46" YPos="1" Width="1" Height="8" />
48+
<Image Name="Frame2Bottom" XPos="46" YPos="9" Width="1" Height="8" />
49+
<Image Name="Frame2Background" XPos="46" YPos="8" Width="1" Height="1" />
50+
51+
<Image Name="ProgressTopLeft" XPos="42" YPos="31" Width="10" Height="7" />
52+
<Image Name="ProgressTopRight" XPos="53" YPos="31" Width="10" Height="7" />
53+
<Image Name="ProgressBottomLeft" XPos="42" YPos="39" Width="10" Height="7" />
54+
<Image Name="ProgressBottomRight" XPos="53" YPos="39" Width="10" Height="7" />
55+
<Image Name="ProgressLeft" XPos="42" YPos="40" Width="10" Height="1" />
56+
<Image Name="ProgressRight" XPos="53" YPos="36" Width="10" Height="1" />
57+
<Image Name="ProgressTop" XPos="53" YPos="31" Width="1" Height="7" />
58+
<Image Name="ProgressBottom" XPos="53" YPos="39" Width="1" Height="7" />
59+
<Image Name="ProgressBackground" XPos="53" YPos="38" Width="1" Height="1" />
60+
<Image Name="ProgressBarDimSegment" XPos="78" YPos="31" Width="5" Height="16" />
61+
<Image Name="ProgressBarLitSegment" XPos="67" YPos="31" Width="5" Height="16" />
62+
63+
<Image Name="ComboboxButtonNormal" XPos="90" YPos="55" Width="16" Height="16" />
64+
<Image Name="ComboboxButtonHover" XPos="90" YPos="74" Width="16" Height="16" />
65+
66+
<Image Name="HeaderLine" XPos="28" YPos="7" Width="1" Height="1" />
67+
<Image Name="HeaderMainBrush" XPos="36" YPos="2" Width="1" Height="1" />
68+
<Image Name="HeaderBottomEdge" XPos="40" YPos="21" Width="1" Height="4" />
69+
<Image Name="HeaderSplitter" XPos="39" YPos="20" Width="2" Height="8" />
70+
<Image Name="LargeLeftArrow" XPos="2" YPos="65" Width="5" Height="9" />
71+
<Image Name="LargeRightArrow" XPos="9" YPos="65" Width="5" Height="9" />
72+
<Image Name="LargeUpArrow" XPos="2" YPos="76" Width="9" Height="5" />
73+
<Image Name="LargeDownArrow" XPos="2" YPos="83" Width="9" Height="5" />
74+
<Image Name="SmallLeftArrow" XPos="20" YPos="66" Width="5" Height="3" />
75+
<Image Name="SmallRightArrow" XPos="26" YPos="66" Width="5" Height="3" />
76+
<Image Name="SmallUpArrow" XPos="20" YPos="66" Width="5" Height="3" />
77+
<Image Name="SmallDownArrow" XPos="26" YPos="66" Width="5" Height="3" />
78+
79+
<Image Name="MouseArrow" XPos="1" YPos="1" Width="12" Height="18" />
80+
<Image Name="NSSizingCursorImage" XPos="2" YPos="105" Width="10" Height="22" />
81+
<Image Name="EWSizingCursorImage" XPos="15" YPos="107" Width="22" Height="10" />
82+
<Image Name="NWSESizingCursorImage" XPos="59" YPos="105" Width="18" Height="18" />
83+
<Image Name="NESWSizingCursorImage" XPos="83" YPos="105" Width="18" Height="18" />
84+
<Image Name="MouseEsWeCursor" XPos="39" YPos="111" Width="19" Height="10" />
85+
<Image Name="MouseMoveCursor" XPos="104" YPos="105" Width="22" Height="22" />
86+
87+
<Image Name="CheckboxNormal" XPos="89" YPos="1" Width="16" Height="16" />
88+
<Image Name="CheckboxHover" XPos="89" YPos="19" Width="16" Height="16" />
89+
<Image Name="CheckboxMark" XPos="89" YPos="37" Width="16" Height="16" />
90+
<Image Name="CheckboxMarkHover" XPos="107" YPos="55" Width="16" Height="16" />
91+
<Image Name="RadioButtonMark" XPos="107" YPos="1" Width="16" Height="16" />
92+
<Image Name="RadioButtonHover" XPos="107" YPos="19" Width="16" Height="16" />
93+
<Image Name="RadioButtonNormal" XPos="107" YPos="37" Width="16" Height="16" />
94+
<Image Name="RadioButtonMarkHover" XPos="107" YPos="73" Width="16" Height="16" />
95+
96+
</Imageset>

0 commit comments

Comments
 (0)