merged RA/CncPerfDebugLogic

separate text and graph, fixes #3491
small repositions to fit with other widgets
This commit is contained in:
Matthias Mailänder
2013-08-08 23:09:48 +02:00
parent 3ae173394b
commit 03a0640f65
8 changed files with 64 additions and 88 deletions

View File

@@ -23,19 +23,27 @@ Container@INGAME_ROOT:
Height: 30
UseContrast: yes
Container@PERFORMANCE_INFO:
Logic:CncPerfDebugLogic
Logic:PerfDebugLogic
Children:
Label@PERF_TEXT:
X:85
Y:10
X:WINDOW_RIGHT - 200
Y:WINDOW_BOTTOM - 70
Width:170
Height:40
Contrast:true
PerfGraph@GRAPH:
VAlign:Top
Background@GRAPH_BG:
X:10
Y:WINDOW_BOTTOM-HEIGHT-10
Width:200
Height:200
Width:220
Height:220
Background:panel-black
Children:
PerfGraph@GRAPH:
X:10
Y:10
Width:200
Height:200
WorldInteractionController@INTERACTION_CONTROLLER:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM

View File

@@ -171,7 +171,7 @@ Container@MENU_BACKGROUND:
Height:35
Text:Back
Container@PERFORMANCE_INFO:
Logic:CncPerfDebugLogic
Logic:PerfDebugLogic
Children:
Label@PERF_TEXT:
X:40

View File

@@ -36,25 +36,28 @@ Container@INGAME_ROOT:
Text:Options (ESC)
Font:Bold
Key: escape
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Container@PERFORMANCE_INFO:
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Label@PERF_TEXT:
X:WINDOW_RIGHT - 200
Y:WINDOW_BOTTOM - 70
Width:170
Height:40
Contrast:true
Background@GRAPH_BG:
ClickThrough:true
Background:dialog4
X:30
Y:WINDOW_BOTTOM - 240
Width:210
Height:210
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
TooltipContainer@TOOLTIP_CONTAINER:
Container@PLAYER_WIDGETS:

View File

@@ -104,22 +104,25 @@ Container@MAINMENU:
Height:35
Text:Quit
Font:Bold
Background@PERF_BG:
ClickThrough:true
Background:dialog4
Logic:PerfDebugLogic
X:10
Y:WINDOW_BOTTOM - 250
Width: 210
Height: 250
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200
Label@TEXT:
X:20
Y:205
Width:170
Height:40
Container@PERFORMANCE_INFO:
Logic:PerfDebugLogic
Children:
Label@PERF_TEXT:
X:30
Y:WINDOW_BOTTOM - 70
Width:170
Height:40
Contrast:true
Background@GRAPH_BG:
ClickThrough:true
Background:dialog4
X:WINDOW_RIGHT - 240
Y:WINDOW_BOTTOM - 240
Width:210
Height:210
Children:
PerfGraph@GRAPH:
X:5
Y:5
Width:200
Height:200