Skip to content

Commit f85129f

Browse files
committed
Reverted skin's configuration, fixed window outline, fixed tab corner.
1 parent f0316cc commit f85129f

File tree

3 files changed

+37
-97
lines changed

3 files changed

+37
-97
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

3-
<Imageset Name="CGUI-Images" Imagefile="CGUI.png" NativeHorzRes="800" NativeVertRes="600" >
3+
<Imageset Name="CGUI-Images" Imagefile="..\..\..\..\..\..\Program Files (x86)\MTA San Andreas 1.5\skins\Default New\CGUI.png" NativeHorzRes="800" NativeVertRes="600" >
44
<Image Name="TabTop" XPos="75" YPos="128" Width="20" Height="7" />
55
<Image Name="TabLeft" XPos="71" YPos="135" Width="4" Height="26" />
66
<Image Name="FrameTop" XPos="44" YPos="164" Width="16" Height="8" />
@@ -35,7 +35,7 @@
3535
<Image Name="SmallUpArrow" XPos="20" YPos="66" Width="5" Height="3" />
3636
<Image Name="ButtonTopLeft" XPos="36" YPos="128" Width="5" Height="5" />
3737
<Image Name="CheckboxHover" XPos="89" YPos="19" Width="15" Height="16" />
38-
<Image Name="Frame2TopLeft" XPos="1" YPos="128" Width="5" Height="5" />
38+
<Image Name="Frame2TopLeft" XPos="36" YPos="128" Width="5" Height="5" />
3939
<Image Name="FrameTopRight" XPos="60" YPos="164" Width="8" Height="8" />
4040
<Image Name="ProgressRight" XPos="53" YPos="38" Width="10" Height="1" />
4141
<Image Name="SButtonBottom" XPos="6" YPos="191" Width="22" Height="6" />

Shared/data/MTA San Andreas/skins/Default/CGUI.lnf.xml

Lines changed: 35 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -72,46 +72,6 @@
7272
</FrameComponent>
7373
</ImagerySection>
7474

75-
<ImagerySection name="Button">
76-
<FrameComponent>
77-
<Area>
78-
<Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
79-
<Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
80-
<Dim type="RightEdge"><UnifiedDim scale="1" type="RightEdge" /></Dim>
81-
<Dim type="BottomEdge"><UnifiedDim scale="1" type="BottomEdge" /></Dim>
82-
</Area>
83-
<Image type="TopLeftCorner" imageset="CGUI-Images" image="ButtonTopLeft" />
84-
<Image type="TopRightCorner" imageset="CGUI-Images" image="ButtonTopRight" />
85-
<Image type="BottomLeftCorner" imageset="CGUI-Images" image="ButtonBottomLeft" />
86-
<Image type="BottomRightCorner" imageset="CGUI-Images" image="ButtonBottomRight" />
87-
<Image type="LeftEdge" imageset="CGUI-Images" image="ButtonLeft" />
88-
<Image type="TopEdge" imageset="CGUI-Images" image="ButtonTop" />
89-
<Image type="RightEdge" imageset="CGUI-Images" image="ButtonRight" />
90-
<Image type="BottomEdge" imageset="CGUI-Images" image="ButtonBottom" />
91-
<Image type="Background" imageset="CGUI-Images" image="ButtonCenter" />
92-
</FrameComponent>
93-
</ImagerySection>
94-
95-
<ImagerySection name="SButton">
96-
<FrameComponent>
97-
<Area>
98-
<Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
99-
<Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
100-
<Dim type="RightEdge"><UnifiedDim scale="1" type="RightEdge" /></Dim>
101-
<Dim type="BottomEdge"><UnifiedDim scale="1" type="BottomEdge" /></Dim>
102-
</Area>
103-
<Image type="TopLeftCorner" imageset="CGUI-Images" image="SButtonTopLeft" />
104-
<Image type="TopRightCorner" imageset="CGUI-Images" image="SButtonTopRight" />
105-
<Image type="BottomLeftCorner" imageset="CGUI-Images" image="SButtonBottomLeft" />
106-
<Image type="BottomRightCorner" imageset="CGUI-Images" image="SButtonBottomRight" />
107-
<Image type="LeftEdge" imageset="CGUI-Images" image="SButtonLeft" />
108-
<Image type="TopEdge" imageset="CGUI-Images" image="SButtonTop" />
109-
<Image type="RightEdge" imageset="CGUI-Images" image="SButtonRight" />
110-
<Image type="BottomEdge" imageset="CGUI-Images" image="SButtonBottom" />
111-
<Image type="Background" imageset="CGUI-Images" image="SButtonCenter" />
112-
</FrameComponent>
113-
</ImagerySection>
114-
11575
</WidgetLook>
11676

11777
<WidgetLook name="CGUI/ScrollablePane">
@@ -203,7 +163,7 @@
203163
<Layer>
204164
<Section section="caption" />
205165
<Section section="selected">
206-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
166+
<!--<Colours topLeft="FF202020" topRight="FF202020" bottomLeft="FF202020" bottomRight="FF202020" />-->
207167
</Section>
208168
</Layer>
209169
</StateImagery>
@@ -219,7 +179,7 @@
219179
<Layer>
220180
<Section section="caption" />
221181
<Section section="main">
222-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
182+
<Colours topLeft="FF303030" topRight="FF303030" bottomLeft="FF303030" bottomRight="FF303030" />
223183
</Section>
224184
</Layer>
225185
</StateImagery>
@@ -239,12 +199,12 @@
239199
<Dim type="RightEdge"><UnifiedDim scale="1" type="RightEdge" /></Dim>
240200
<Dim type="BottomEdge"><UnifiedDim scale="1" type="BottomEdge" /></Dim>
241201
</Area>
242-
<Image type="TopLeftCorner" imageset="CGUI-Images" image="TabTopLeft" />
243-
<Image type="TopRightCorner" imageset="CGUI-Images" image="TabTopRight" />
244-
<Image type="LeftEdge" imageset="CGUI-Images" image="TabLeft" />
245-
<Image type="TopEdge" imageset="CGUI-Images" image="TabTop" />
246-
<Image type="RightEdge" imageset="CGUI-Images" image="TabRight" />
247-
<Image type="Background" imageset="CGUI-Images" image="TabBackground" />
202+
<Image type="TopLeftCorner" imageset="CGUI-Images" image="Frame2TopLeft" />
203+
<Image type="TopRightCorner" imageset="CGUI-Images" image="Frame2TopRight" />
204+
<Image type="LeftEdge" imageset="CGUI-Images" image="Frame2Left" />
205+
<Image type="TopEdge" imageset="CGUI-Images" image="Frame2Top" />
206+
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
207+
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
248208
</FrameComponent>
249209
</ImagerySection>
250210
<ImagerySection name="inactive_frame">
@@ -255,12 +215,12 @@
255215
<Dim type="RightEdge"><UnifiedDim scale="1" type="RightEdge" /></Dim>
256216
<Dim type="BottomEdge"><UnifiedDim scale="1" type="BottomEdge" /></Dim>
257217
</Area>
258-
<Image type="TopLeftCorner" imageset="CGUI-Images" image="TabTopLeft" />
259-
<Image type="TopRightCorner" imageset="CGUI-Images" image="TabTopRight" />
260-
<Image type="LeftEdge" imageset="CGUI-Images" image="TabLeft" />
261-
<Image type="TopEdge" imageset="CGUI-Images" image="TabTop" />
262-
<Image type="RightEdge" imageset="CGUI-Images" image="TabRight" />
263-
<Image type="Background" imageset="CGUI-Images" image="TabBackground" />
218+
<Image type="TopLeftCorner" imageset="CGUI-Images" image="FrameTopLeft" />
219+
<Image type="TopRightCorner" imageset="CGUI-Images" image="FrameTopRight" />
220+
<Image type="LeftEdge" imageset="CGUI-Images" image="FrameLeft" />
221+
<Image type="TopEdge" imageset="CGUI-Images" image="FrameTop" />
222+
<Image type="RightEdge" imageset="CGUI-Images" image="FrameRight" />
223+
<Image type="Background" imageset="CGUI-Images" image="GenericBrush" />
264224
</FrameComponent>
265225
</ImagerySection>
266226
<ImagerySection name="label">
@@ -278,7 +238,7 @@
278238
<StateImagery name="Normal">
279239
<Layer>
280240
<Section section="inactive_frame">
281-
<Colours topLeft="FF888888" topRight="FF888888" bottomLeft="FF888888" bottomRight="FF888888" />
241+
<Colours topLeft="FF171717" topRight="FF171717" bottomLeft="FF171717" bottomRight="FF171717" />
282242
</Section>
283243
<Section section="label">
284244
<ColourProperty name="NormalTextColour" />
@@ -287,8 +247,8 @@
287247
</StateImagery>
288248
<StateImagery name="Hover">
289249
<Layer>
290-
<Section section="frame">
291-
<Colours topLeft="FFDDDDDD" topRight="FFDDDDDD" bottomLeft="FFDDDDDD" bottomRight="FFDDDDDD" />
250+
<Section section="inactive_frame">
251+
<Colours topLeft="FF303030" topRight="FF303030" bottomLeft="FF303030" bottomRight="FF303030" />
292252
</Section>
293253
<Section section="label">
294254
<ColourProperty name="HoverTextColour" />
@@ -298,7 +258,7 @@
298258
<StateImagery name="Selected">
299259
<Layer>
300260
<Section section="frame">
301-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
261+
<Colours topLeft="FFEEEEEE" topRight="FFEEEEEE" bottomLeft="FFEEEEEE" bottomRight="FFEEEEEE" />
302262
</Section>
303263
<Section section="label">
304264
<ColourProperty name="PushedTextColour" />
@@ -376,10 +336,10 @@
376336
</WidgetLook>
377337

378338
<WidgetLook name="CGUI/Button">
379-
<Property name="NormalTextColour" value="FFAAAAAA" />
380-
<Property name="HoverTextColour" value="FFAAAAFF" />
381-
<Property name="PushedTextColour" value="FFFFFFFF" />
382-
<Property name="DisabledTextColour" value="FF666666" />
339+
<Property name="NormalTextColour" value="FF7C7C7C" />
340+
<Property name="HoverTextColour" value="FFFFFFFF" />
341+
<Property name="PushedTextColour" value="FF7C7C7C" />
342+
<Property name="DisabledTextColour" value="FF383838" />
383343
<Property name="WantsMultiClickEvents" value="False" />
384344
<ImagerySection name="label">
385345
<TextComponent>
@@ -395,8 +355,8 @@
395355
</ImagerySection>
396356
<StateImagery name="Normal">
397357
<Layer>
398-
<Section look="CGUI/Shared" section="SButton">
399-
<Colours topLeft="FF888888" topRight="FF888888" bottomLeft="FF888888" bottomRight="FF888888" />
358+
<Section look="CGUI/Shared" section="Frame2">
359+
<Colours topLeft="FF606060" topRight="FF606060" bottomLeft="FF606060" bottomRight="FF606060" />
400360
</Section>
401361
<Section section="label">
402362
<ColourProperty name="NormalTextColour" />
@@ -405,7 +365,7 @@
405365
</StateImagery>
406366
<StateImagery name="Hover">
407367
<Layer>
408-
<Section look="CGUI/Shared" section="Button">
368+
<Section look="CGUI/Shared" section="Frame2">
409369

410370
</Section>
411371
<Section section="label">
@@ -415,7 +375,7 @@
415375
</StateImagery>
416376
<StateImagery name="Pushed">
417377
<Layer>
418-
<Section look="CGUI/Shared" section="Button">
378+
<Section look="CGUI/Shared" section="Frame2">
419379

420380
</Section>
421381
<Section section="label">
@@ -425,8 +385,8 @@
425385
</StateImagery>
426386
<StateImagery name="Disabled">
427387
<Layer>
428-
<Section look="CGUI/Shared" section="SButton">
429-
<Colours topLeft="FF444444" topRight="FF444444" bottomLeft="FF444444" bottomRight="FF444444" />
388+
<Section look="CGUI/Shared" section="Frame2">
389+
<Colours topLeft="FF282828" topRight="FF282828" bottomLeft="FF282828" bottomRight="FF282828" />
430390
</Section>
431391
<Section section="label">
432392
<ColourProperty name="DisabledTextColour" />
@@ -509,27 +469,7 @@
509469
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
510470
<Image type="BottomEdge" imageset="CGUI-Images" image="Frame2Bottom" />
511471
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
512-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
513-
</FrameComponent>
514-
</ImagerySection>
515-
<ImagerySection name="withtitle_frame_active">
516-
<FrameComponent>
517-
<Area>
518-
<Dim type="LeftEdge"><AbsoluteDim value="0" /></Dim>
519-
<Dim type="TopEdge"><AbsoluteDim value="0" /></Dim>
520-
<Dim type="RightEdge"><UnifiedDim scale="1" type="RightEdge" /></Dim>
521-
<Dim type="BottomEdge"><UnifiedDim scale="1" type="BottomEdge" /></Dim>
522-
</Area>
523-
<Image type="TopLeftCorner" imageset="CGUI-Images" image="Frame2TopLeft" />
524-
<Image type="TopRightCorner" imageset="CGUI-Images" image="Frame2TopRight" />
525-
<Image type="BottomLeftCorner" imageset="CGUI-Images" image="Frame2BottomLeft" />
526-
<Image type="BottomRightCorner" imageset="CGUI-Images" image="Frame2BottomRight" />
527-
<Image type="LeftEdge" imageset="CGUI-Images" image="Frame2Left" />
528-
<Image type="TopEdge" imageset="CGUI-Images" image="Frame2Top" />
529-
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
530-
<Image type="BottomEdge" imageset="CGUI-Images" image="Frame2Bottom" />
531-
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
532-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
472+
<Colours topLeft="FF202020" topRight="FF202020" bottomLeft="FF202020" bottomRight="FF202020" />
533473
</FrameComponent>
534474
</ImagerySection>
535475
<ImagerySection name="notitle_frame">
@@ -549,7 +489,7 @@
549489
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
550490
<Image type="BottomEdge" imageset="CGUI-Images" image="Frame2Bottom" />
551491
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
552-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
492+
<Colours topLeft="FF202020" topRight="FF202020" bottomLeft="FF202020" bottomRight="FF202020" />
553493
</FrameComponent>
554494
</ImagerySection>
555495
<ImagerySection name="withtitle_noframe_client_area">
@@ -569,7 +509,7 @@
569509
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
570510
<Image type="BottomEdge" imageset="CGUI-Images" image="Frame2Bottom" />
571511
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
572-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
512+
<Colours topLeft="FF202020" topRight="FF202020" bottomLeft="FF202020" bottomRight="FF202020" />
573513
</FrameComponent>
574514
</ImagerySection>
575515
<ImagerySection name="notitle_noframe_client_area">
@@ -589,12 +529,12 @@
589529
<Image type="RightEdge" imageset="CGUI-Images" image="Frame2Right" />
590530
<Image type="BottomEdge" imageset="CGUI-Images" image="Frame2Bottom" />
591531
<Image type="Background" imageset="CGUI-Images" image="Frame2Background" />
592-
<Colours topLeft="FFFFFFFF" topRight="FFFFFFFF" bottomLeft="FFFFFFFF" bottomRight="FFFFFFFF" />
532+
<Colours topLeft="FF202020" topRight="FF202020" bottomLeft="FF202020" bottomRight="FF202020" />
593533
</FrameComponent>
594534
</ImagerySection>
595535
<StateImagery name="ActiveWithTitleWithFrame">
596536
<Layer>
597-
<Section section="withtitle_frame_active" />
537+
<Section section="withtitle_frame" />
598538
</Layer>
599539
</StateImagery>
600540
<StateImagery name="InactiveWithTitleWithFrame">
@@ -777,8 +717,8 @@
777717
<Area>
778718
<Dim type="LeftEdge" ><AbsoluteDim value="0" /></Dim>
779719
<Dim type="TopEdge" ><AbsoluteDim value="0" /></Dim>
780-
<Dim type="Width" ><UnifiedDim scale="1" type="Width" /></Dim>
781-
<Dim type="Height" ><UnifiedDim scale="1" type="Height" /></Dim>
720+
<Dim type="Width" ><UnifiedDim scale="0.9" type="Width" /></Dim>
721+
<Dim type="Height" ><UnifiedDim scale="0.9" type="Height" /></Dim>
782722
</Area>
783723
<Image imageset="CGUI-Images" image="ScrollbarThumb" />
784724
<!--<Colours topLeft="FFC1D1DA" topRight="FFC1D1DA" bottomLeft="FFC1D1DA" bottomRight="FFC1D1DA" />-->
Loading

0 commit comments

Comments
 (0)