Tweak header positioning and scrollpanel scissoring (don't draw contents over the 1px border).
This commit is contained in:
@@ -71,7 +71,7 @@ namespace OpenRA.Widgets
|
|||||||
WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
|
WidgetUtils.DrawRGBA(ChromeProvider.GetImage("scrollbar", "down_arrow"),
|
||||||
new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
|
new float2(downButtonRect.Left + downOffset, downButtonRect.Top + downOffset));
|
||||||
|
|
||||||
Game.Renderer.EnableScissor(backgroundRect.X, backgroundRect.Y + HeaderHeight, backgroundRect.Width, backgroundRect.Height - HeaderHeight);
|
Game.Renderer.EnableScissor(backgroundRect.X+1, backgroundRect.Y + HeaderHeight+1, backgroundRect.Width-2, backgroundRect.Height - HeaderHeight-2);
|
||||||
|
|
||||||
foreach (var child in Children)
|
foreach (var child in Children)
|
||||||
child.Draw( wr );
|
child.Draw( wr );
|
||||||
|
|||||||
@@ -32,9 +32,9 @@ Background@SERVER_LOBBY:
|
|||||||
ScrollPanel@PLAYERSX:
|
ScrollPanel@PLAYERSX:
|
||||||
Id:PLAYERSX
|
Id:PLAYERSX
|
||||||
X:20
|
X:20
|
||||||
Y:75
|
Y:67
|
||||||
Width:504
|
Width:504
|
||||||
Height:227
|
Height:235
|
||||||
Children:
|
Children:
|
||||||
Container@PLAYERS:
|
Container@PLAYERS:
|
||||||
Id:PLAYERS
|
Id:PLAYERS
|
||||||
@@ -229,11 +229,11 @@ Background@SERVER_LOBBY:
|
|||||||
Y:0
|
Y:0
|
||||||
Container@LABEL_CONTAINER:
|
Container@LABEL_CONTAINER:
|
||||||
X:25
|
X:25
|
||||||
Y:45
|
Y:40
|
||||||
Children:
|
Children:
|
||||||
Label@LABEL_LOBBY_NAME:
|
Label@LABEL_LOBBY_NAME:
|
||||||
Id:LABEL_LOBBY_NAME
|
Id:LABEL_LOBBY_NAME
|
||||||
Width:139
|
Width:150
|
||||||
Height:25
|
Height:25
|
||||||
X:0
|
X:0
|
||||||
Y:0
|
Y:0
|
||||||
@@ -242,39 +242,39 @@ Background@SERVER_LOBBY:
|
|||||||
Bold:True
|
Bold:True
|
||||||
Label@LABEL_LOBBY_COLOR:
|
Label@LABEL_LOBBY_COLOR:
|
||||||
Id:LABEL_LOBBY_COLOR
|
Id:LABEL_LOBBY_COLOR
|
||||||
Width:65
|
Width:80
|
||||||
Height:25
|
Height:25
|
||||||
X:159
|
X:160
|
||||||
Y:0
|
Y:0
|
||||||
Text:Color
|
Text:Color
|
||||||
Align:Center
|
Align:Center
|
||||||
Bold:True
|
Bold:True
|
||||||
Label@LABEL_LOBBY_FACTION:
|
Label@LABEL_LOBBY_FACTION:
|
||||||
Id:LABEL_LOBBY_FACTION
|
Id:LABEL_LOBBY_FACTION
|
||||||
Width:110
|
Width:130
|
||||||
Height:25
|
Height:25
|
||||||
X:244
|
X:250
|
||||||
Y:0
|
Y:0
|
||||||
Text:Faction
|
Text:Faction
|
||||||
Align:Center
|
Align:Center
|
||||||
Bold:True
|
Bold:True
|
||||||
Label@LABEL_LOBBY_TEAM:
|
Label@LABEL_LOBBY_TEAM:
|
||||||
Id:LABEL_LOBBY_TEAM
|
Id:LABEL_LOBBY_TEAM
|
||||||
Width:70
|
Width:48
|
||||||
Height:25
|
Height:25
|
||||||
X:351
|
X:390
|
||||||
Y:0
|
Y:0
|
||||||
Text:Team
|
Text:Team
|
||||||
Align:Center
|
Align:Center
|
||||||
Bold:True
|
Bold:True
|
||||||
Label@LABEL_LOBBY_STATUS:
|
Label@LABEL_LOBBY_STATUS:
|
||||||
Id:LABEL_LOBBY_STATUS
|
Id:LABEL_LOBBY_STATUS
|
||||||
X:420
|
X:448
|
||||||
Y:0
|
Y:0
|
||||||
Width:70
|
Width:20
|
||||||
Height:25
|
Height:25
|
||||||
Text:Ready
|
Text:Ready
|
||||||
Align:Center
|
Align:Left
|
||||||
Bold:True
|
Bold:True
|
||||||
Button@CHANGEMAP_BUTTON:
|
Button@CHANGEMAP_BUTTON:
|
||||||
Id:CHANGEMAP_BUTTON
|
Id:CHANGEMAP_BUTTON
|
||||||
|
|||||||
Reference in New Issue
Block a user