Merge pull request #3607 from pchote/widget-focus

Split keyboard/mouse focus and use C&C world tooltips in RA/D2K.
This commit is contained in:
Matthias Mailänder
2013-07-29 10:49:11 -07:00
28 changed files with 363 additions and 530 deletions

View File

@@ -36,7 +36,10 @@ Container@INGAME_ROOT:
Y:WINDOW_BOTTOM-HEIGHT-10
Width:200
Height:200
CncWorldInteractionController@INTERACTION_CONTROLLER:
WorldInteractionController@INTERACTION_CONTROLLER:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
ViewportController:
Width:WINDOW_RIGHT
Height:WINDOW_BOTTOM
TooltipContainer:TOOLTIP_CONTAINER

View File

@@ -25,8 +25,11 @@ Background@BUTTON_TOOLTIP:
Background@WORLD_TOOLTIP:
Logic:WorldTooltipLogic
Background:panel-black
Width:141
Children:
Container@SINGLE_HEIGHT:
Height:25
Container@DOUBLE_HEIGHT:
Height:45
Label@LABEL:
X:5
Height:23