diff options
| author | raysfire <[email protected]> | 2015-07-02 22:56:35 -0500 |
|---|---|---|
| committer | raysfire <[email protected]> | 2015-07-02 22:56:35 -0500 |
| commit | 5ff0541bb3789e974110d2235fbce4ce3a973f6e (patch) | |
| tree | b2a21eca947678edc5735d3ba3e5c71da0ec524a /resource/ui | |
| parent | da82763f71ce1f17dc9e300f6ba4089ff2b90c3d (diff) | |
Fixed item panels when in spec (normal + tournament)
Diffstat (limited to 'resource/ui')
| -rw-r--r-- | resource/ui/Spectator.res | 65 | ||||
| -rw-r--r-- | resource/ui/SpectatorTournament.res | 68 |
2 files changed, 79 insertions, 54 deletions
diff --git a/resource/ui/Spectator.res b/resource/ui/Spectator.res index 6444818..ed2cd8a 100644 --- a/resource/ui/Spectator.res +++ b/resource/ui/Spectator.res @@ -295,37 +295,36 @@ "font_lodef" "DefaultVerySmall"
"wrap" "1"
}
- "itempanel"
+ "itempanel"
{
"ControlName" "CItemModelPanel"
"fieldName" "itempanel"
- "xpos" "r249"
- "ypos" "c0"
- "zpos" "1"
- "wide" "240"
- "tall" "900"
+ "xpos" "0"
+ "ypos" "0"
+ "zpos" "10"
+ "wide" "190"
+ "tall" "100"
"visible" "0"
"bgcolor_override" "255 255 255 0"
"PaintBackgroundType" "0"
- "paintborder" "0"
- "model_xpos" "10"
- "model_center_y" "1"
- "model_wide" "64"
- "model_tall" "48"
+ "model_ypos" "10"
+ "model_center_x" "1"
+ "model_wide" "90"
+ "model_tall" "60"
- "text_xpos" "90"
- "text_ypos" "25"
- "text_wide" "150"
+ "text_xpos" "10"
+ "text_ypos" "10"
+ "text_wide" "170"
"text_center" "1"
- "max_text_height" "90"
+ "max_text_height" "100"
"padding_height" "10"
"resize_to_text" "1"
"text_forcesize" "2"
- "ItemBackground"
- {
+ "ItemBackground"
+ {
"ControlName" "ImagePanel"
"fieldName" "ItemBackground"
"xpos" "0"
@@ -338,9 +337,9 @@ "visible" "1"
"enabled" "1"
"fillcolor" "0 0 0 100"
- }
- "TitleBackground"
- {
+ }
+ "TitleBackground"
+ {
"ControlName" "ImagePanel"
"fieldName" "TitleBackground"
"xpos" "4"
@@ -353,33 +352,47 @@ "visible" "1"
"enabled" "1"
"fillcolor" "0 0 0 100"
- }
+ }
"itemmodelpanel"
{
"fieldName" "itemmodelpanel"
- "use_item_rendertarget" "1"
+ "use_item_rendertarget" "0"
"useparentbg" "1"
}
"ItemLabel"
{
- "ControlName" "CExLabel"
+ "ControlName" "Label"
"fieldName" "ItemLabel"
"font" "Cerbetica12"
"xpos" "10"
- "ypos" "5"
+ "ypos" "3"
"zpos" "1"
"wide" "270"
- "tall" "12"
+ "tall" "16"
"autoResize" "0"
"pinCorner" "0"
"visible" "1"
"enabled" "1"
"labelText" "#FreezePanel_Item"
- "textAlignment" "south-west"
+ "textAlignment" "Left"
"dulltext" "0"
"brighttext" "0"
}
+ }
+
+ "spectator_extras"
+ {
+ "ControlName" "EditablePanel"
+ "fieldName" "spectator_extras"
+ "xpos" "0"
+ "ypos" "0"
+ "wide" "f0"
+ "tall" "480"
+ "autoResize" "0"
+ "pinCorner" "0"
+ "visible" "1"
+ "enabled" "1"
}
}
diff --git a/resource/ui/SpectatorTournament.res b/resource/ui/SpectatorTournament.res index 673cf8b..1d29056 100644 --- a/resource/ui/SpectatorTournament.res +++ b/resource/ui/SpectatorTournament.res @@ -14,7 +14,7 @@ "team1_player_base_y" "460" "team1_player_delta_x" "0" "team1_player_delta_y" "-16" - "team2_player_base_offset_x" "207" + "team2_player_base_offset_x" "240" "team2_player_base_y" "460" "team2_player_delta_x" "0" "team2_player_delta_y" "-16" @@ -457,37 +457,36 @@ "fieldName" "TipLabel" "visible" "0" } - "itempanel" + "itempanel" { "ControlName" "CItemModelPanel" "fieldName" "itempanel" - "xpos" "r249" - "ypos" "c0" - "zpos" "1" - "wide" "240" - "tall" "900" + "xpos" "0" + "ypos" "0" + "zpos" "10" + "wide" "190" + "tall" "100" "visible" "0" "bgcolor_override" "255 255 255 0" "PaintBackgroundType" "0" - "paintborder" "0" - "model_xpos" "10" - "model_center_y" "1" - "model_wide" "64" - "model_tall" "48" + "model_ypos" "10" + "model_center_x" "1" + "model_wide" "90" + "model_tall" "60" - "text_xpos" "90" - "text_ypos" "25" - "text_wide" "150" + "text_xpos" "10" + "text_ypos" "10" + "text_wide" "170" "text_center" "1" - "max_text_height" "90" + "max_text_height" "100" "padding_height" "10" "resize_to_text" "1" "text_forcesize" "2" - "ItemBackground" - { + "ItemBackground" + { "ControlName" "ImagePanel" "fieldName" "ItemBackground" "xpos" "0" @@ -500,9 +499,9 @@ "visible" "1" "enabled" "1" "fillcolor" "0 0 0 100" - } - "TitleBackground" - { + } + "TitleBackground" + { "ControlName" "ImagePanel" "fieldName" "TitleBackground" "xpos" "4" @@ -515,33 +514,46 @@ "visible" "1" "enabled" "1" "fillcolor" "0 0 0 100" - } + } "itemmodelpanel" { "fieldName" "itemmodelpanel" - "use_item_rendertarget" "1" + "use_item_rendertarget" "0" "useparentbg" "1" } "ItemLabel" { - "ControlName" "CExLabel" + "ControlName" "Label" "fieldName" "ItemLabel" "font" "Cerbetica12" "xpos" "10" - "ypos" "5" + "ypos" "3" "zpos" "1" "wide" "270" - "tall" "12" + "tall" "16" "autoResize" "0" "pinCorner" "0" "visible" "1" "enabled" "1" "labelText" "#FreezePanel_Item" - "textAlignment" "south-west" + "textAlignment" "Left" "dulltext" "0" "brighttext" "0" } - } + } + "spectator_extras" + { + "ControlName" "EditablePanel" + "fieldName" "spectator_extras" + "xpos" "0" + "ypos" "0" + "wide" "f0" + "tall" "480" + "autoResize" "0" + "pinCorner" "0" + "visible" "1" + "enabled" "1" + } } |